griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

crash fix for brush select when no object is active

Browse Source
This commit is contained in:
Campbell Barton
2012-04-24 12:27:38 +00:00
parent e06e338e20
commit bde288d656
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/sculpt_paint/paint_ops.c
View File

@@ -254,12 +254,18 @@ static int brush_select_exec(bContext *C, wmOperator *op)
size_t tool_offset;
if (paint_mode == OB_MODE_ACTIVE) {
/* select current paint mode */
paint_mode = CTX_data_active_object(C)->mode &
(OB_MODE_SCULPT |
OB_MODE_VERTEX_PAINT |
OB_MODE_WEIGHT_PAINT |
OB_MODE_TEXTURE_PAINT);
Object *ob = CTX_data_active_object(C);
if (ob) {
/* select current paint mode */
paint_mode = ob->mode &
(OB_MODE_SCULPT |
OB_MODE_VERTEX_PAINT |
OB_MODE_WEIGHT_PAINT |
OB_MODE_TEXTURE_PAINT);
}
else {
return OPERATOR_CANCELLED;
}
}
switch (paint_mode) {