archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merging r47307 through r47325 from trunk into soc-2011-tomato

Browse Source
This commit is contained in:
Sergey Sharybin
2012-06-01 14:08:18 +00:00
parent 1691414d44 4fc4aa383b
commit c9aa6cf80d
51 changed files with 655 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/node.c
View File

@@ -1822,6 +1822,7 @@ void nodeRegisterType(bNodeTreeType *ttype, bNodeType *ntype)
static void registerCompositNodes(bNodeTreeType *ttype)
{
register_node_type_frame(ttype);
register_node_type_reroute(ttype);
register_node_type_cmp_group(ttype);
// register_node_type_cmp_forloop(ttype);
@@ -1918,6 +1919,7 @@ static void registerCompositNodes(bNodeTreeType *ttype)
static void registerShaderNodes(bNodeTreeType *ttype)
{
register_node_type_frame(ttype);
register_node_type_reroute(ttype);
register_node_type_sh_group(ttype);
//register_node_type_sh_forloop(ttype);
@@ -1990,6 +1992,7 @@ static void registerShaderNodes(bNodeTreeType *ttype)
static void registerTextureNodes(bNodeTreeType *ttype)
{
register_node_type_frame(ttype);
register_node_type_reroute(ttype);
register_node_type_tex_group(ttype);
// register_node_type_tex_forloop(ttype);