[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35110] trunk/blender/source/blender: The material "Dynamic" node (disabled anyway) had incomplete base type initialization, which made it appear as an empty item in the input node category.

Lukas Toenne lukas.toenne at googlemail.com
Wed Feb 23 14:50:41 CET 2011


Revision: 35110
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35110
Author:   lukastoenne
Date:     2011-02-23 13:50:41 +0000 (Wed, 23 Feb 2011)
Log Message:
-----------
The material "Dynamic" node (disabled anyway) had incomplete base type initialization, which made it appear as an empty item in the input node category.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/node.c
    trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c

Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c	2011-02-23 13:43:45 UTC (rev 35109)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2011-02-23 13:50:41 UTC (rev 35110)
@@ -3436,7 +3436,7 @@
 	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);

Modified: trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c	2011-02-23 13:43:45 UTC (rev 35109)
+++ trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c	2011-02-23 13:50:41 UTC (rev 35110)
@@ -762,7 +762,7 @@
 {
 	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 @@
 {
 	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);
 }




More information about the Bf-blender-cvs mailing list