diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2022-05-31 22:45:24 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2022-05-31 22:45:24 +0300 |
| commit | 79cee340a8af413822e752057b71bf0c91e6e40c (patch) | |
| tree | fd83e4cc0ed3d5e6e5f2f94b2ca7350e5ea7ce65 | |
| parent | b9f29a0f645de693c37174747ece2baba496c899 (diff) | |
| parent | 511a08585d2934b38e7d3de447752686b5f0e15b (diff) | |
Merge branch 'blender-v3.2-release'
| m--------- | release/datafiles/locale | 0 | ||||
| m--------- | release/scripts/addons | 0 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image.cc | 4 |
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, |