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

Nodes: fix nodes in groups not getting socket templates verified, and reserve

Browse Source 
some socket flags for cycles to avoid conflicts.
This commit is contained in:
Brecht Van Lommel
2011-09-17 13:03:42 +00:00
parent 100313db6e
commit 3232102cb8
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenloader/intern/readfile.c
View File

@@ -2142,7 +2142,7 @@ static void lib_verify_nodetree(Main *main, int UNUSED(open))
ntreetype->foreach_nodetree(main, NULL, lib_nodetree_init_types_cb); ntreetype->foreach_nodetree(main, NULL, lib_nodetree_init_types_cb);
} }
for(ntree= main->nodetree.first; ntree; ntree= ntree->id.next) 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; int has_old_groups=0;

9
source/blender/makesdna/DNA_node_types.h
View File

@@ -103,10 +103,11 @@ typedef struct bNodeSocket {
#define SOCK_FLOAT 0 #define SOCK_FLOAT 0
#define SOCK_VECTOR 1 #define SOCK_VECTOR 1
#define SOCK_RGBA 2 #define SOCK_RGBA 2
#define SOCK_INT 3 #define SOCK_SHADER 3
#define SOCK_BOOLEAN 4 #define SOCK_BOOLEAN 4
#define SOCK_MESH 5 #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) */ /* socket side (input/output) */
#define SOCK_IN 1 #define SOCK_IN 1
@@ -123,6 +124,10 @@ typedef struct bNodeSocket {
#define SOCK_DYNAMIC 16 #define SOCK_DYNAMIC 16
/* group socket should not be exposed */ /* group socket should not be exposed */
#define SOCK_INTERNAL 32 #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 { typedef struct bNodePreview {
unsigned char *rect; unsigned char *rect;