[Bf-blender-cvs] [38eed4ada36] master: Fix T97553: SCULPT_handles_colors_report called for non-sculpt brushes

[Joseph Eagar]

Commit: 38eed4ada363861abc6d44fee5816a2c384fea22
Author: Joseph Eagar
Date:   Mon Apr 25 12:26:02 2022 -0700
Branches: master
https://developer.blender.org/rB38eed4ada363861abc6d44fee5816a2c384fea22

Fix T97553: SCULPT_handles_colors_report called for non-sculpt brushes

===================================================================

M	source/blender/editors/sculpt_paint/sculpt.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 93a60b9908e..bfe28cb09e1 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -5447,8 +5447,10 @@ static int sculpt_brush_stroke_invoke(bContext *C, wmOperator *op, const wmEvent
   sculpt_brush_stroke_init(C, op);
 
   Object *ob = CTX_data_active_object(C);
+  Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
+  Brush *brush = BKE_paint_brush(&sd->paint);
 
-  if (!SCULPT_handles_colors_report(ob->sculpt, op->reports)) {
+  if (SCULPT_TOOL_NEEDS_COLOR(brush->sculpt_tool) && !SCULPT_handles_colors_report(ob->sculpt, op->reports)) {
     return OPERATOR_CANCELLED;
   }