[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28497] branches/render25/source/blender/ blenkernel/intern/node.c: Render Branch: svn merge https://svn.blender.org/ svnroot/bf-blender/trunk/blender -r28488:28496
Campbell Barton
ideasman42 at gmail.com
Wed Apr 28 20:15:44 CEST 2010
Revision: 28497
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28497
Author: campbellbarton
Date: 2010-04-28 20:15:43 +0200 (Wed, 28 Apr 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28488:28496
Modified Paths:
--------------
branches/render25/source/blender/blenkernel/intern/node.c
Modified: branches/render25/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/node.c 2010-04-28 18:13:03 UTC (rev 28496)
+++ branches/render25/source/blender/blenkernel/intern/node.c 2010-04-28 18:15:43 UTC (rev 28497)
@@ -114,7 +114,8 @@
}
}
node->typeinfo= stype;
- node->typeinfo->initfunc(node);
+ if(node->typeinfo)
+ node->typeinfo->initfunc(node);
} else {
node->typeinfo= node_get_type(ntree, node->type, (bNodeTree *)node->id, NULL);
}
More information about the Bf-blender-cvs
mailing list