From bf2c2d43ef3ff955560a6b22be04c8860d0beabe Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Sat, 24 Sep 2016 12:49:43 +1200 Subject: Fix T49441: Grease Pencil - pie menu - brush name field crashes blender Using context.active_gpencil_brush to access the active Grease Pencil brush would result in a crash if trying to rename the brush, because the "ID" pointer was not set. To be backported to 2.78 --- source/blender/editors/screen/screen_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/screen') diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index 34c51914027..c165bbfd301 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -509,7 +509,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult bGPDbrush *brush = BKE_gpencil_brush_getactive(scene->toolsettings); if (brush) { - CTX_data_pointer_set(result, NULL, &RNA_GPencilBrush, brush); + CTX_data_pointer_set(result, &scene->id, &RNA_GPencilBrush, brush); return 1; } } -- cgit v1.2.3