diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-08-01 20:17:44 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-08-01 20:17:44 +0400 |
| commit | c7ba25fdf88e5215914c1fd4ce6235b2683c2acf (patch) | |
| tree | 32e32540ca935a8e368e20ac28787ddd6962e48e /source/blender/makesrna | |
| parent | aa23f98bda685d645aca03bf12608db628983122 (diff) | |
Fix own regression in cycles frame node caused by recent node rna changes
--
svn merge -r49465:49466 ^/branches/soc-2011-tomato
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 7bbe277f679..472b0693ae5 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -217,12 +217,15 @@ static StructRNA *rna_Node_refine(struct PointerRNA *ptr) #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 @@ static void init(void) #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) |