blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix T42311, too many paint slots added. 

Don't allow the add paint slot operator to redo. Also guard better against
excessive slot addition
This commit is contained in:
Antonis Ryakiotakis 2014-10-20 20:08:22 +02:00
parent 50cb62a3a0
commit abb266973d
Notes: blender-bot 2023-02-14 09:55:26 +01:00 
Referenced by issue #42311, Texture paint slot duplicate or crash happens
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/sculpt_paint/paint_image_proj.c
View File

@ -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");