[Bf-blender-cvs] [4f06c7c8389] blender2.8: Fix T56457: Crash when selecting Grease Pencil objects

[Joshua Leung]

Commit: 4f06c7c8389d144394efdda8829f3d01283694d6
Author: Joshua Leung
Date:   Tue Aug 21 17:05:27 2018 +1200
Branches: blender2.8
https://developer.blender.org/rB4f06c7c8389d144394efdda8829f3d01283694d6

Fix T56457: Crash when selecting Grease Pencil objects

Thanks to Charlie Jolly (@charlie) for the backtrace

===================================================================

M       source/blender/editors/gpencil/gpencil_ops.c

===================================================================

diff --git a/source/blender/editors/gpencil/gpencil_ops.c 
b/source/blender/editors/gpencil/gpencil_ops.c
index 67e3d484596..d39dd085add 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -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));
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs