[Bf-blender-cvs] [670f5de] master: Fix for potential bug in paint brush RNA updates, was casting to wrong DNA type.

Lukas Tönne noreply at git.blender.org
Mon Dec 1 19:55:58 CET 2014


Commit: 670f5deda62b35e8ed6e91f732052da775eb09f3
Author: Lukas Tönne
Date:   Mon Dec 1 19:54:19 2014 +0100
Branches: master
https://developer.blender.org/rB670f5deda62b35e8ed6e91f732052da775eb09f3

Fix for potential bug in paint brush RNA updates, was casting to wrong
DNA type.

The update function is for the Paint struct, containing a Brush pointer
property, not Brush itself. Probably went fine so far because was only
used for a notifier pointer, but still ...

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

M	source/blender/makesrna/intern/rna_sculpt_paint.c

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

diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index 09e42e4..73b7e31 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -289,7 +289,8 @@ static char *rna_ParticleBrush_path(PointerRNA *UNUSED(ptr))
 
 static void rna_Paint_brush_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
-	Brush *br = (Brush *)ptr->data;
+	Paint *paint = ptr->data;
+	Brush *br = paint->brush;
 	BKE_paint_invalidate_overlay_all();
 	WM_main_add_notifier(NC_BRUSH | NA_EDITED, br);
 }




More information about the Bf-blender-cvs mailing list