[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51692] trunk/blender/source/blender/ editors/interface/interface_templates.c: Bugfix, IRC reported

Ton Roosendaal ton at blender.org
Sat Oct 27 18:47:09 CEST 2012


Revision: 51692
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51692
Author:   ton
Date:     2012-10-27 16:47:08 +0000 (Sat, 27 Oct 2012)
Log Message:
-----------
Bugfix, IRC reported

In texture buttons, changing the preview could crash.
The preview template was accidentally providing a Texture ID where a Material
was meant to be given.

Crash occurred due adding code in material update that checked/cleared node
previews.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_templates.c

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2012-10-27 15:34:54 UTC (rev 51691)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2012-10-27 16:47:08 UTC (rev 51692)
@@ -1221,7 +1221,7 @@
 			else ma = (Material *)pparent;
 			
 			/* Create RNA Pointer */
-			RNA_pointer_create(id, &RNA_Material, ma, &material_ptr);
+			RNA_pointer_create(&ma->id, &RNA_Material, ma, &material_ptr);
 
 			col = uiLayoutColumn(row, TRUE);
 			uiLayoutSetScaleX(col, 1.5);




More information about the Bf-blender-cvs mailing list