diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-11-26 20:20:35 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-11-26 20:20:35 +0400 |
| commit | f8759797e6f47a9c788cdf5ee77a1b1d0992b524 (patch) | |
| tree | c3b78a1af6ab7ee2d26fff0077cff05ac96e26f8 /source/blender/blenkernel | |
| parent | 3509dd9d7f25913df2a110a86576910863bcd1b5 (diff) | |
fix for crash copying nodes, regression since last release.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 06b846a6df9..e5500108f46 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -406,13 +406,14 @@ bNode *nodeCopyNode(struct bNodeTree *ntree, struct bNode *node) /* 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) |