paint: shader fixes

Author: luboslenco

paint/sources/render/make_sculpt.c

@@ -162,7 +162,10 @@ node_shader_context_t *sculpt_make_sculpt_run(material_t *data, material_context
 	bool           particle = g_context->tool == TOOL_TYPE_PARTICLE;
 	// Decal fill layer: displacement must be confined to the decal box projection
 	bool decal_layer      = g_context->layer->fill_material != NULL && g_context->layer->uv_type == UV_TYPE_PROJECT && g_context->tool == TOOL_TYPE_FILL;
-	bool sculpt_triplanar = !decal && !decal_layer && g_context->tool != TOOL_TYPE_BLUR;
+
+	bool has_wposition = g_context->tool == TOOL_TYPE_BRUSH || g_context->tool == TOOL_TYPE_ERASER || g_context->tool == TOOL_TYPE_CLONE ||
+	                     g_context->tool == TOOL_TYPE_BLUR || g_context->tool == TOOL_TYPE_PARTICLE || g_context->tool == TOOL_TYPE_FILL || decal;
+	bool sculpt_triplanar = has_wposition && !decal && !decal_layer && g_context->tool != TOOL_TYPE_BLUR;
 	node_shader_add_out(kong, "tex_coord: float2");
 	node_shader_write_vert(kong, "var madd: float2 = float2(0.5, 0.5);");
 	node_shader_write_vert(kong, "output.tex_coord = input.pos.xy * madd + madd;");
@@ -503,9 +506,6 @@ node_shader_context_t *sculpt_make_sculpt_run(material_t *data, material_context
 		}
 	}
 
-	bool has_wposition = g_context->tool == TOOL_TYPE_BRUSH || g_context->tool == TOOL_TYPE_ERASER || g_context->tool == TOOL_TYPE_CLONE ||
-	                     g_context->tool == TOOL_TYPE_BLUR || g_context->tool == TOOL_TYPE_PARTICLE || g_context->tool == TOOL_TYPE_FILL || decal;
-
 	if (g_context->select_active && has_wposition) {
 		node_shader_add_constant(kong, "VP: float4x4", "_view_proj_matrix");
 		node_shader_add_constant(kong, "select_mask: float4", "_select_mask");

paint/sources/render/render_path_paint.c

@@ -1127,7 +1127,7 @@ void render_path_paint_bind_layers() {
 		}
 	}
 
-	if (g_context->colorid_picked && g_context->colorid_viewport_mask) {
+	if (g_context->colorid_viewport_mask) {
 		render_path_bind_target("texpaint_colorid", "texpaint_colorid");
 	}
 }