[Bf-blender-cvs] [4ed7fb5] blender-v2.78-release: Fix T49441: Grease Pencil - pie menu - brush name field crashes blender

Joshua Leung noreply at git.blender.org
Mon Sep 26 10:54:07 CEST 2016


Commit: 4ed7fb581a59657888d55b950879db0a44e4dcde
Author: Joshua Leung
Date:   Sat Sep 24 12:49:43 2016 +1200
Branches: blender-v2.78-release
https://developer.blender.org/rB4ed7fb581a59657888d55b950879db0a44e4dcde

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

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

M	source/blender/editors/screen/screen_context.c

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

diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c
index 34c5191..c165bbf 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;
 		}
 	}




More information about the Bf-blender-cvs mailing list