[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52576] trunk/blender/source/blender/ blenkernel/intern/node.c: fix for crash copying nodes, regression since last release.
Campbell Barton
ideasman42 at gmail.com
Mon Nov 26 17:20:36 CET 2012
Revision: 52576
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52576
Author: campbellbarton
Date: 2012-11-26 16:20:35 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
fix for crash copying nodes, regression since last release.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/node.c
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2012-11-26 15:12:17 UTC (rev 52575)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2012-11-26 16:20:35 UTC (rev 52576)
@@ -406,13 +406,14 @@
/* only shader nodes get pleasant preview updating this way, compo uses own system */
if (node->preview) {
- if (ntree->type == NTREE_SHADER) {
+ if (ntree && (ntree->type == NTREE_SHADER)) {
nnode->preview = MEM_dupallocN(node->preview);
if (node->preview->rect)
nnode->preview->rect = MEM_dupallocN(node->preview->rect);
}
- else
+ else {
nnode->preview = NULL;
+ }
}
if (ntree)
More information about the Bf-blender-cvs
mailing list