[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40295] trunk/blender/source/blender: Nodes: fix nodes in groups not getting socket templates verified, and reserve

[Brecht Van Lommel]

Revision: 40295
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40295
Author:   blendix
Date:     2011-09-17 13:03:42 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
Nodes: fix nodes in groups not getting socket templates verified, and reserve
some socket flags for cycles to avoid conflicts.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/makesdna/DNA_node_types.h

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-09-17 12:31:22 UTC (rev 40294)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-09-17 13:03:42 UTC (rev 40295)
@@ -2142,7 +2142,7 @@
 			ntreetype->foreach_nodetree(main, NULL, lib_nodetree_init_types_cb);
 	}
 	for(ntree= main->nodetree.first; ntree; ntree= ntree->id.next)
-		ntreeInitTypes(ntree);
+		lib_nodetree_init_types_cb(NULL, NULL, ntree);
 	
 	{
 		int has_old_groups=0;

Modified: trunk/blender/source/blender/makesdna/DNA_node_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_node_types.h	2011-09-17 12:31:22 UTC (rev 40294)
+++ trunk/blender/source/blender/makesdna/DNA_node_types.h	2011-09-17 13:03:42 UTC (rev 40295)
@@ -103,10 +103,11 @@
 #define SOCK_FLOAT			0
 #define SOCK_VECTOR			1
 #define SOCK_RGBA			2
-#define SOCK_INT			3
+#define SOCK_SHADER			3
 #define SOCK_BOOLEAN		4
 #define SOCK_MESH			5
-#define NUM_SOCKET_TYPES	6	/* must be last! */
+#define SOCK_INT			6
+#define NUM_SOCKET_TYPES	7	/* must be last! */
 
 /* socket side (input/output) */
 #define SOCK_IN		1
@@ -123,6 +124,10 @@
 #define SOCK_DYNAMIC			16
 	/* group socket should not be exposed */
 #define SOCK_INTERNAL			32
+	/* socket collapsed in UI */
+#define SOCK_COLLAPSED			64
+	/* hide socket value, if it gets auto default */
+#define SOCK_HIDE_VALUE			128
 
 typedef struct bNodePreview {
 	unsigned char *rect;