From df7be614382ba6ce58a2fab4ff6b4ab0b09b0a9f Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 5 Aug 2016 23:33:22 +0200 Subject: Fix T49023: Segfault when switching brushes while renaming another brush. rna_GPencilBrush_name_set() was trying to use a mere bGPDbrush as a complete ToolSettings, was doomed to fail... --- source/blender/makesrna/intern/rna_scene.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source') diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 8a4f41d963d..b6abe983060 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -542,7 +542,7 @@ static void rna_GPencilBrush_index_range(PointerRNA *ptr, int *min, int *max, in static void rna_GPencilBrush_name_set(PointerRNA *ptr, const char *value) { - ToolSettings *ts = (ToolSettings *) ptr->data; + ToolSettings *ts = ((Scene *) ptr->id.data)->toolsettings; bGPDbrush *brush = ptr->data; /* copy the new name into the name slot */ -- cgit v1.2.3