paint: make color id view work in path traced mode
This commit is contained in:
@@ -61,7 +61,7 @@ void render_path_base_begin() {
|
||||
}
|
||||
|
||||
// Match projection matrix jitter
|
||||
bool skip_taa = g_context->split_view || g_context->viewport_mode == VIEWPORT_MODE_PATH_TRACE || g_context->camera_type == CAMERA_TYPE_ORTHOGRAPHIC ||
|
||||
bool skip_taa = g_context->split_view || (g_context->viewport_mode == VIEWPORT_MODE_PATH_TRACE && g_context->tool != TOOL_TYPE_COLORID) || g_context->camera_type == CAMERA_TYPE_ORTHOGRAPHIC ||
|
||||
((g_context->tool == TOOL_TYPE_CLONE || g_context->tool == TOOL_TYPE_BLUR) && g_context->pdirty > 0);
|
||||
|
||||
if (skip_taa || g_config->brush_live) {
|
||||
@@ -145,7 +145,8 @@ void render_path_base_draw_split(void (*draw_commands)(void)) {
|
||||
render_path_base_draw_gbuffer();
|
||||
|
||||
bool use_live_layer = g_context->tool == TOOL_TYPE_MATERIAL;
|
||||
g_context->viewport_mode == VIEWPORT_MODE_PATH_TRACE ? render_path_raytrace_draw(use_live_layer) : draw_commands();
|
||||
bool path_trace = g_context->viewport_mode == VIEWPORT_MODE_PATH_TRACE && g_context->tool != TOOL_TYPE_COLORID;
|
||||
path_trace ? render_path_raytrace_draw(use_live_layer) : draw_commands();
|
||||
|
||||
g_context->view_index = g_context->view_index == 0 ? 1 : 0;
|
||||
transform_set_matrix(cam->base->transform, camera_views[g_context->view_index]);
|
||||
@@ -165,7 +166,7 @@ void render_path_base_commands(void (*draw_commands)(void)) {
|
||||
render_path_base_draw_gbuffer();
|
||||
render_path_paint_draw();
|
||||
|
||||
if (g_context->viewport_mode == VIEWPORT_MODE_PATH_TRACE) {
|
||||
if (g_context->viewport_mode == VIEWPORT_MODE_PATH_TRACE && g_context->tool != TOOL_TYPE_COLORID) {
|
||||
bool use_live_layer = g_context->tool == TOOL_TYPE_MATERIAL;
|
||||
render_path_raytrace_draw(use_live_layer);
|
||||
g_context->last_paint_vec_x = g_context->paint_vec.x;
|
||||
|
||||
Reference in New Issue
Block a user