diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2011-02-23 16:50:41 +0300 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2011-02-23 16:50:41 +0300 |
| commit | 4fe21e0b4f44e1fcf87b36c8d27da11340998b4c (patch) | |
| tree | 411ca80026932114ff89441047e9cfdf1ff640bc | |
| parent | 65bb4ff8d1042dc289c359ca08dc88e23e932a13 (diff) | |
The material "Dynamic" node (disabled anyway) had incomplete base type initialization, which made it appear as an empty item in the input node category.
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 2 | ||||
| -rw-r--r-- | source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 943a33acf13..631c4e76115 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -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); diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c b/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c index 12017d11616..75c6799c92a 100644 --- a/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c +++ b/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c @@ -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); } |