diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-17 17:03:42 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-17 17:03:42 +0400 |
| commit | 3232102cb8c50ff4463ab0d0de3f47d3196d66ea (patch) | |
| tree | b20a514d77752039465c9f2ff25c7a7252587434 | |
| parent | 100313db6ecec36ad0c8e5b8a8d11bd170ff9349 (diff) | |
Nodes: fix nodes in groups not getting socket templates verified, and reserve
some socket flags for cycles to avoid conflicts.
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index d0c34376aea..a5748201d32 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2142,7 +2142,7 @@ static void lib_verify_nodetree(Main *main, int UNUSED(open)) 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; diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index bac1e3cd8ca..4cfd0b56b70 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -103,10 +103,11 @@ typedef struct bNodeSocket { #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 @@ typedef struct bNodeSocket { #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; |