[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49466] branches/soc-2011-tomato/source/ blender/makesrna/intern/rna_nodetree.c: Fix own regression in cycles material group cased by recent changes in nodes rna

Sergey Sharybin sergey.vfx at gmail.com
Wed Aug 1 18:16:11 CEST 2012


Revision: 49466
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49466
Author:   nazgul
Date:     2012-08-01 16:16:10 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
Fix own regression in cycles material group cased by recent changes in nodes rna

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c

Modified: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c	2012-08-01 15:32:27 UTC (rev 49465)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c	2012-08-01 16:16:10 UTC (rev 49466)
@@ -217,12 +217,15 @@
 		#include "rna_nodetree_types.h"
 		
 		case NODE_GROUP:
+			return &RNA_NodeGroup;
 		case NODE_FORLOOP:
+			return &RNA_NodeForLoop;
 		case NODE_WHILELOOP:
+			return &RNA_NodeWhileLoop;
 		case NODE_FRAME:
+			return &RNA_NodeFrame;
 		case NODE_REROUTE:
-			return &RNA_SpecialNode;
-			
+			return &RNA_NodeReroute;
 		default:
 			return &RNA_Node;
 	}
@@ -1051,11 +1054,11 @@
 		
 	#include "rna_nodetree_types.h"
 	
-	reg_node(NODE_GROUP, Category_GroupNode, "GROUP", "NodeGroup", "Node", "Group", "");
-	reg_node(NODE_FORLOOP, Category_LoopNode, "FORLOOP", "NodeForLoop", "Node", "ForLoop", "");
-	reg_node(NODE_WHILELOOP, Category_LoopNode, "WHILELOOP", "NodeWhileLoop", "Node", "WhileLoop", "");
-	reg_node(NODE_FRAME, Category_LayoutNode, "FRAME", "NodeFrame", "Node", "Frame", "");
-	reg_node(NODE_REROUTE, Category_LayoutNode, "REROUTE", "NodeReroute", "Node", "Reroute", "");
+	reg_node(NODE_GROUP, Category_GroupNode, "GROUP", "NodeGroup", "SpecialNode", "Group", "");
+	reg_node(NODE_FORLOOP, Category_LoopNode, "FORLOOP", "NodeForLoop", "SpecialNode", "ForLoop", "");
+	reg_node(NODE_WHILELOOP, Category_LoopNode, "WHILELOOP", "NodeWhileLoop", "SpecialNode", "WhileLoop", "");
+	reg_node(NODE_FRAME, Category_LayoutNode, "FRAME", "NodeFrame", "SpecialNode", "Frame", "");
+	reg_node(NODE_REROUTE, Category_LayoutNode, "REROUTE", "NodeReroute", "SpecialNode", "Reroute", "");
 }
 
 static StructRNA *def_node(BlenderRNA *brna, int node_id)




More information about the Bf-blender-cvs mailing list