diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-10-20 22:08:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-21 14:14:27 +0400 |
| commit | caaeaf922b341f32a645af0c6bdc9aae10ff2249 (patch) | |
| tree | d8553e285fc275168d1bc65b7e70ec037a0ab928 /source | |
| parent | f01a81109374d88d79acdb5ce40f40ef15a8e00f (diff) | |
Fix T42311, too many paint slots added.
Don't allow the add paint slot operator to redo. Also guard better against
excessive slot addition
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 7fe13070b45..a1738877aca 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -5086,9 +5086,8 @@ static bool proj_paint_add_slot(bContext *C, wmOperator *op) ima = mtex->tex->ima = proj_paint_image_create(op, bmain); } - WM_event_add_notifier(C, NC_TEXTURE, CTX_data_scene(C)); + WM_event_add_notifier(C, NC_TEXTURE | NA_ADDED, mtex->tex); } - WM_event_add_notifier(C, NC_TEXTURE | NA_ADDED, mtex->tex); } if (ima) { @@ -5160,7 +5159,7 @@ void PAINT_OT_add_texture_paint_slot(wmOperatorType *ot) ot->poll = ED_operator_region_view3d_active; /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; /* properties */ prop = RNA_def_enum(ot->srna, "type", layer_type_items, 0, "Type", "Merge method to use"); |