[Bf-blender-cvs] [62f68639e04] sculpt-dev: Sculpt-dev: Fix color filter not auto creating a color layer.

Joseph Eagar noreply at git.blender.org
Mon Nov 29 03:37:07 CET 2021


Commit: 62f68639e04fa4d13ce792297197129e92192f32
Author: Joseph Eagar
Date:   Sun Nov 28 18:36:03 2021 -0800
Branches: sculpt-dev
https://developer.blender.org/rB62f68639e04fa4d13ce792297197129e92192f32

Sculpt-dev: Fix color filter not auto
            creating a color layer.

* This is probably something I broke.
  There was a SCULPT_has_colors() call that
  wasn't needed.

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

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

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

diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_color.c b/source/blender/editors/sculpt_paint/sculpt_filter_color.c
index c349220bfe0..1b746edc5be 100644
--- a/source/blender/editors/sculpt_paint/sculpt_filter_color.c
+++ b/source/blender/editors/sculpt_paint/sculpt_filter_color.c
@@ -341,14 +341,10 @@ static int sculpt_color_filter_invoke(bContext *C, wmOperator *op, const wmEvent
     return OPERATOR_CANCELLED;
   }
 
-  if (!SCULPT_has_colors(ss)) {
-    return OPERATOR_CANCELLED;
-  }
+  BKE_sculpt_color_layer_create_if_needed(ob);
 
   SCULPT_undo_push_begin(ob, "color filter");
 
-  BKE_sculpt_color_layer_create_if_needed(ob);
-
   /* CTX_data_ensure_evaluated_depsgraph should be used at the end to include the updates of
    * earlier steps modifying the data. */
   Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);



More information about the Bf-blender-cvs mailing list