The material "Dynamic" node (disabled anyway) had incomplete base type initialization...
authorLukas Toenne <lukas.toenne@googlemail.com>
Wed, 23 Feb 2011 13:50:41 +0000 (13:50 +0000)
committerLukas Toenne <lukas.toenne@googlemail.com>
Wed, 23 Feb 2011 13:50:41 +0000 (13:50 +0000)
source/blender/blenkernel/intern/node.c
source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c

index 943a33acf130ab85c722f705ba8d246cbe6c0cff..631c4e761150c5745918dcb8fa55118848b1b959 100644 (file)
@@ -3436,7 +3436,7 @@ static void registerShaderNodes(ListBase *ntypelist)
        register_node_type_sh_value(ntypelist);
        register_node_type_sh_rgb(ntypelist);
        register_node_type_sh_texture(ntypelist);
-       register_node_type_sh_dynamic(ntypelist);
+//     register_node_type_sh_dynamic(ntypelist);
        register_node_type_sh_invert(ntypelist);
        register_node_type_sh_seprgb(ntypelist);
        register_node_type_sh_combrgb(ntypelist);
index 12017d11616c90431955700c1ab0f1fb097e847e..75c6799c92a2fac7442dfbf64ba44017f1e898af 100644 (file)
@@ -762,7 +762,7 @@ void register_node_type_sh_dynamic(ListBase *lb)
 {
        static bNodeType ntype;
        
-       node_type_base(&ntype, SH_NODE_DYNAMIC, "Dynamic", NODE_CLASS_OP_DYNAMIC, NODE_OPTIONS, NULL, NULL);
+       node_type_base(&ntype, NODE_DYNAMIC, "Dynamic", NODE_CLASS_OP_DYNAMIC, NODE_OPTIONS, NULL, NULL);
        node_type_size(&ntype, 150, 60, 300);
        node_type_init(&ntype, node_dynamic_init_cb);
        node_type_storage(&ntype, "NodeScriptDict", node_dynamic_free_storage_cb, node_dynamic_copy_cb);
@@ -777,7 +777,7 @@ void register_node_type_sh_dynamic(ListBase *lb)
 {
        static bNodeType ntype;
        
-       node_type_base(&ntype, 0, "", 0, 0, NULL, NULL);
+       node_type_base(&ntype, NODE_DYNAMIC, "Dynamic", NODE_CLASS_OP_DYNAMIC, 0, NULL, NULL);
        
        nodeRegisterType(lb, &ntype);
 }