Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2015-05-17 14:43:48 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2015-05-17 14:44:22 +0300
commitb68fa820d6eae686b7c2d3d01bc8b24bdc2120ee (patch)
tree5541814f7d281ec88cc45b302f85fb7da0adb4b7 /source/blender/compositor/intern
parent3b359f1feaa1b8784a6a5b1f1bd7d12a2d4acb20 (diff)
Fix T44715: crash compositing with undefined node due to re-save in older version
Diffstat (limited to 'source/blender/compositor/intern')
-rw-r--r--source/blender/compositor/intern/COM_Converter.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/compositor/intern/COM_Converter.cpp b/source/blender/compositor/intern/COM_Converter.cpp
index 9de22612bdc..9fa59be4a1c 100644
--- a/source/blender/compositor/intern/COM_Converter.cpp
+++ b/source/blender/compositor/intern/COM_Converter.cpp
@@ -137,6 +137,10 @@ Node *Converter::convert(bNode *b_node)
{
Node *node = NULL;
+ /* ignore undefined nodes with missing or invalid node data */
+ if (!nodeIsRegistered(b_node))
+ return NULL;
+
switch (b_node->type) {
case CMP_NODE_COMPOSITE:
node = new CompositorNode(b_node);