[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41915] trunk/blender/source/blender/ editors/space_buttons/buttons_context.c: Fix #29243: unlink texture datablock from material node in texture properties

Brecht Van Lommel brechtvanlommel at pandora.be
Wed Nov 16 14:49:52 CET 2011


Revision: 41915
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41915
Author:   blendix
Date:     2011-11-16 13:49:51 +0000 (Wed, 16 Nov 2011)
Log Message:
-----------
Fix #29243: unlink texture datablock from material node in texture properties
could crash, RNA pointer from context was invalid.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_buttons/buttons_context.c

Modified: trunk/blender/source/blender/editors/space_buttons/buttons_context.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/buttons_context.c	2011-11-16 13:39:58 UTC (rev 41914)
+++ trunk/blender/source/blender/editors/space_buttons/buttons_context.c	2011-11-16 13:49:51 UTC (rev 41915)
@@ -805,7 +805,7 @@
 
 				if(ma) {
 					bNode *node= give_current_material_texture_node(ma);
-					CTX_data_pointer_set(result, &ma->id, &RNA_Node, node);
+					CTX_data_pointer_set(result, &ma->nodetree->id, &RNA_Node, node);
 				}
 			}
 




More information about the Bf-blender-cvs mailing list