[Bf-blender-cvs] [b68fa82] master: Fix T44715: crash compositing with undefined node due to re-save in older version

[Brecht Van Lommel]

Commit: b68fa820d6eae686b7c2d3d01bc8b24bdc2120ee
Author: Brecht Van Lommel
Date:   Sun May 17 13:43:48 2015 +0200
Branches: master
https://developer.blender.org/rBb68fa820d6eae686b7c2d3d01bc8b24bdc2120ee

Fix T44715: crash compositing with undefined node due to re-save in older version

===================================================================

M	source/blender/compositor/intern/COM_Converter.cpp

===================================================================

diff --git a/source/blender/compositor/intern/COM_Converter.cpp b/source/blender/compositor/intern/COM_Converter.cpp
index 9de2261..9fa59be 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);