diff options
author | Ton Roosendaal <ton@blender.org> | 2006-01-02 22:09:37 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-01-02 22:09:37 +0300 |
commit | 0943a0249cc04fbf0f6bddc3df3f83569b5eb7c0 (patch) | |
tree | 51dec78905a3d076291b04fbc6a63e7dc2719ae4 /source/blender/makesdna/DNA_node_types.h | |
parent | c1a4e42a75d16f50972007cf9608998fa207dc21 (diff) |
Orange: enabled thread render for node trees.
Works with groups too! But, discovered a bug with texture nodes inside
of groups... will do that next.
Diffstat (limited to 'source/blender/makesdna/DNA_node_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index c20022b48ef..9ebadb6b86d 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -106,7 +106,8 @@ typedef struct bNode { short type, flag; short done, level; /* both for dependency and sorting */ short lasty, menunr; /* lasty: check preview render status, menunr: browse ID blocks */ - short pad1, pad2; + short stack_index; /* for groupnode, offset in global caller stack */ + short pad; ListBase inputs, outputs; struct ID *id; /* optional link to libdata */ @@ -116,7 +117,7 @@ typedef struct bNode { float locx, locy; /* root offset for drawing */ float width, miniwidth; short custom1, custom2; /* to be abused for buttons */ - int pad3; + int pad1; rctf totr; /* entire boundbox */ rctf butr; /* optional buttons area */ @@ -152,8 +153,8 @@ typedef struct bNodeTree { ListBase nodes, links; - void *data; /* custom data, set by execute caller, no read/write handling */ - bNodeStack *stack; /* stack is only while executing, no read/write */ + bNodeStack *stack; /* stack is only while executing, no read/write in file */ + bNodeStack *stack1; /* for other thread, easy to expand though... */ int type, init; /* set init on fileread */ int cur_index, pad; /* sockets in groups have unique identifiers, adding new sockets always will increase this counter */ |