[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46269] trunk/blender/source/blender/nodes : Fix #31288: Blender crash when select a material
Sergey Sharybin
sergey.vfx at gmail.com
Fri May 4 13:49:58 CEST 2012
Revision: 46269
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46269
Author: nazgul
Date: 2012-05-04 11:49:58 +0000 (Fri, 04 May 2012)
Log Message:
-----------
Fix #31288: Blender crash when select a material
Quite the same issue as render crash on missed shader groups, needed a NULL-check
in node exec function as well.
Modified Paths:
--------------
trunk/blender/source/blender/nodes/shader/nodes/node_shader_common.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_common.c
Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_common.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_common.c 2012-05-04 11:32:26 UTC (rev 46268)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_common.c 2012-05-04 11:49:58 UTC (rev 46269)
@@ -124,6 +124,9 @@
bNodeTreeExec *exec= (bNodeTreeExec*)nodedata;
bNodeThreadStack *nts;
+ if (!exec)
+ return;
+
/* XXX same behavior as trunk: all nodes inside group are executed.
* it's stupid, but just makes it work. compo redesign will do this better.
*/
Modified: trunk/blender/source/blender/nodes/texture/nodes/node_texture_common.c
===================================================================
--- trunk/blender/source/blender/nodes/texture/nodes/node_texture_common.c 2012-05-04 11:32:26 UTC (rev 46268)
+++ trunk/blender/source/blender/nodes/texture/nodes/node_texture_common.c 2012-05-04 11:49:58 UTC (rev 46269)
@@ -110,6 +110,9 @@
bNodeTreeExec *exec= (bNodeTreeExec*)nodedata;
bNodeThreadStack *nts;
+ if (!exec)
+ return;
+
/* XXX same behavior as trunk: all nodes inside group are executed.
* it's stupid, but just makes it work. compo redesign will do this better.
*/
More information about the Bf-blender-cvs
mailing list