blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Merge branch 'blender-v3.2-release'

This commit is contained in:
Joseph Eagar 2022-05-31 12:45:24 -07:00
parent b9f29a0f64 511a08585d
commit 79cee340a8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/datafiles/locale

@ -1 +1 @@
Subproject commit ebc3989630d18afe00624fc5e4bae6cc0de7a260
Subproject commit 71e0f87dd1ba4e0ed5f619b031045a428e534230

2
release/scripts/addons

@ -1 +1 @@
Subproject commit 1c8e7f124d17b64ff05cbe179264ba7c7c3aa9fc
Subproject commit bcb71eea69a7b83c44112a5872ccd67cae96ec6f

4
source/blender/editors/sculpt_paint/paint_image.cc
View File

@ -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,