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

Fix T56457: Crash when selecting Grease Pencil objects

Browse Source 
Thanks to Charlie Jolly (@charlie) for the backtrace
This commit is contained in:
Joshua Leung
2018-08-21 17:05:27 +12:00
parent 2a5f319465
commit 4f06c7c838
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/gpencil/gpencil_ops.c
View File

@@ -129,7 +129,8 @@ static bool gp_stroke_paintmode_draw_poll(bContext *C)
bGPdata *gpd = CTX_data_gpencil_data(C);
ToolSettings *ts = CTX_data_tool_settings(C);
Brush *brush = BKE_brush_getactive_gpencil(ts);
return (gpd && (gpd->flag & GP_DATA_STROKE_PAINTMODE) && (brush) &&
return ((gpd) && (gpd->flag & GP_DATA_STROKE_PAINTMODE) &&
(brush && brush->gpencil_settings) &&
(brush->gpencil_settings->brush_type == GP_BRUSH_TYPE_DRAW));
}
@@ -140,7 +141,8 @@ static bool gp_stroke_paintmode_erase_poll(bContext *C)
bGPdata *gpd = CTX_data_gpencil_data(C);
ToolSettings *ts = CTX_data_tool_settings(C);
Brush *brush = BKE_brush_getactive_gpencil(ts);
return (gpd && (gpd->flag & GP_DATA_STROKE_PAINTMODE) && (brush) &&
return ((gpd) && (gpd->flag & GP_DATA_STROKE_PAINTMODE) &&
(brush && brush->gpencil_settings) &&
(brush->gpencil_settings->brush_type == GP_BRUSH_TYPE_ERASE));
}
@@ -151,7 +153,8 @@ static bool gp_stroke_paintmode_fill_poll(bContext *C)
bGPdata *gpd = CTX_data_gpencil_data(C);
ToolSettings *ts = CTX_data_tool_settings(C);
Brush *brush = BKE_brush_getactive_gpencil(ts);
return (gpd && (gpd->flag & GP_DATA_STROKE_PAINTMODE) && (brush) &&
return ((gpd) && (gpd->flag & GP_DATA_STROKE_PAINTMODE) &&
(brush && brush->gpencil_settings) &&
(brush->gpencil_settings->brush_type == GP_BRUSH_TYPE_FILL));
}