[Bf-blender-cvs] [03b7982301d] blender-v3.4-release: Sculpt: Fix T102349: improperly aliased enum

Joseph Eagar noreply at git.blender.org
Sun Nov 20 18:44:07 CET 2022


Commit: 03b7982301d082780fd0acef8159ea49f88ce6c3
Author: Joseph Eagar
Date:   Sun Nov 20 09:41:53 2022 -0800
Branches: blender-v3.4-release
https://developer.blender.org/rB03b7982301d082780fd0acef8159ea49f88ce6c3

Sculpt: Fix T102349: improperly aliased enum

PaintMaskFloodMode is supposed to be an alias
of eSelectOp.  paint_intern.h now includes
ED_select_utils.h and simply assigns the
relevent members of eSelectOp to PaintMaskFloodMode's
members.

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

M	source/blender/editors/sculpt_paint/paint_intern.h

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

diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h
index c6fe7ed3072..c830823a1ff 100644
--- a/source/blender/editors/sculpt_paint/paint_intern.h
+++ b/source/blender/editors/sculpt_paint/paint_intern.h
@@ -13,6 +13,8 @@
 #include "BLI_math.h"
 #include "BLI_rect.h"
 
+#include "ED_select_utils.h"
+
 #include "DNA_scene_types.h"
 
 #ifdef __cplusplus
@@ -472,9 +474,9 @@ void PAINT_OT_hide_show(struct wmOperatorType *ot);
 /* paint_mask.c */
 
 typedef enum {
-  PAINT_MASK_FLOOD_VALUE,
-  PAINT_MASK_FLOOD_VALUE_INVERSE,
-  PAINT_MASK_INVERT,
+  PAINT_MASK_FLOOD_VALUE = SEL_OP_SUB,
+  PAINT_MASK_FLOOD_VALUE_INVERSE = SEL_OP_ADD,
+  PAINT_MASK_INVERT = SEL_OP_XOR,
 } PaintMaskFloodMode;
 
 void PAINT_OT_mask_flood_fill(struct wmOperatorType *ot);



More information about the Bf-blender-cvs mailing list