[Bf-blender-cvs] [511a08585d2] blender-v3.2-release: Fix T98364: Remove improper OPTYPE_UNDO flags

Joseph Eagar noreply at git.blender.org
Tue May 31 21:45:09 CEST 2022


Commit: 511a08585d2934b38e7d3de447752686b5f0e15b
Author: Joseph Eagar
Date:   Tue May 31 12:43:07 2022 -0700
Branches: blender-v3.2-release
https://developer.blender.org/rB511a08585d2934b38e7d3de447752686b5f0e15b

Fix T98364: Remove improper OPTYPE_UNDO flags

Removed OPTYPE_UNDO flags from the swap brush colors and
sample color operators.  These types of operators are
not supposed to be undoable in the first place.  Also
memfile undo is too buggy for it.

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

M	release/datafiles/locale
M	release/scripts/addons
M	source/blender/editors/sculpt_paint/paint_image.cc

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index ebc3989630d..71e0f87dd1b 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit ebc3989630d18afe00624fc5e4bae6cc0de7a260
+Subproject commit 71e0f87dd1ba4e0ed5f619b031045a428e534230
diff --git a/release/scripts/addons b/release/scripts/addons
index 1c8e7f124d1..bcb71eea69a 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 1c8e7f124d17b64ff05cbe179264ba7c7c3aa9fc
+Subproject commit bcb71eea69a7b83c44112a5872ccd67cae96ec6f
diff --git a/source/blender/editors/sculpt_paint/paint_image.cc b/source/blender/editors/sculpt_paint/paint_image.cc
index a313489885d..e726fd3f338 100644
--- a/source/blender/editors/sculpt_paint/paint_image.cc
+++ b/source/blender/editors/sculpt_paint/paint_image.cc
@@ -736,7 +736,7 @@ void PAINT_OT_sample_color(wmOperatorType *ot)
   ot->poll = sample_color_poll;
 
   /* flags */
-  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+  ot->flag = OPTYPE_REGISTER;
 
   /* properties */
   PropertyRNA *prop;
@@ -954,7 +954,7 @@ void PAINT_OT_brush_colors_flip(wmOperatorType *ot)
   ot->poll = brush_colors_flip_poll;
 
   /* flags */
-  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+  ot->flag = OPTYPE_REGISTER;
 }
 
 void ED_imapaint_bucket_fill(struct bContext *C,



More information about the Bf-blender-cvs mailing list