Small fix for r53685: Allow setting NULL/None as parent, i.e. detach a node from a frame.

1 files changed, 14 insertions, 10 deletions

diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 276eba2033e..eecdf13813c 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -293,18 +293,22 @@ static void rna_Node_parent_set(PointerRNA *ptr, PointerRNA value)
 	bNode *node = ptr->data;
 	bNode *parent = value.data;
 	
-	/* XXX only Frame node allowed for now,
-	 * in the future should have a poll function or so to test possible attachment.
-	 */
-	if (parent->type != NODE_FRAME)
-		return;
-	
-	/* make sure parent is not attached to the node */
-	if (nodeAttachNodeCheck(parent, node))
-		return;
+	if (parent) {
+		/* XXX only Frame node allowed for now,
+		 * in the future should have a poll function or so to test possible attachment.
+		 */
+		if (parent->type != NODE_FRAME)
+			return;
+		
+		/* make sure parent is not attached to the node */
+		if (nodeAttachNodeCheck(parent, node))
+			return;
+	}
 	
 	nodeDetachNode(node);
-	nodeAttachNode(node, parent);
+	if (parent) {
+		nodeAttachNode(node, parent);
+	}
 }
 
 static int rna_Node_parent_poll(PointerRNA *ptr, PointerRNA value)