Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Eagar <joeedh@gmail.com>2022-05-31 22:43:07 +0300
committerJoseph Eagar <joeedh@gmail.com>2022-05-31 22:43:07 +0300
commit511a08585d2934b38e7d3de447752686b5f0e15b (patch)
treee2dfc58bede81100183887a1e36d7cdd23286dcb
parent0f47506cde50c4542a0a3c7863b0fb4e735bf8f0 (diff)
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/locale0
m---------release/scripts/addons0
-rw-r--r--source/blender/editors/sculpt_paint/paint_image.cc4
3 files changed, 2 insertions, 2 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale
-Subproject ebc3989630d18afe00624fc5e4bae6cc0de7a26
+Subproject 71e0f87dd1ba4e0ed5f619b031045a428e53423
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject 1c8e7f124d17b64ff05cbe179264ba7c7c3aa9f
+Subproject bcb71eea69a7b83c44112a5872ccd67cae96ec6
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,