[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58074] trunk/blender/source/blender/ editors/space_node/node_edit.c: Partial fix for #36024, don' t always reset the node editor tree pointer if the type is undefined.

[Lukas Toenne]

Revision: 58074
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58074
Author:   lukastoenne
Date:     2013-07-08 11:38:09 +0000 (Mon, 08 Jul 2013)
Log Message:
-----------
Partial fix for #36024, don't always reset the node editor tree pointer if the type is undefined. This can happen if the tree type is defined by addon or script, in which case the tree type would be unknown the first time the context is checked, but registered right afterward. Also unknown tree types are handled fine, they just display dummy nodes in red warning color.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/node_edit.c

Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c	2013-07-08 11:29:08 UTC (rev 58073)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c	2013-07-08 11:38:09 UTC (rev 58074)
@@ -577,9 +577,10 @@
 	if (!treetype ||
 	    (treetype->poll && !treetype->poll(C, treetype)))
 	{
-		/* invalid tree type, disable */
-		snode->tree_idname[0] = '\0';
-		ED_node_tree_start(snode, NULL, NULL, NULL);
+		/* invalid tree type, skip
+		 * NB: not resetting the node path here, invalid bNodeTreeType
+		 * may still be registered at a later point.
+		 */
 		return;
 	}