diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-09-07 07:49:55 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-09-07 07:53:06 +0300 |
| commit | 1601089ece8a1f62c4c8d965fbef8073ccf0e0e5 (patch) | |
| tree | f3a84201ed715d5d20d8a7888ea42fcc7af898cb /source/blender/makesdna/DNA_node_types.h | |
| parent | f1021ee9290ecba9b799a0abc93be50e15209477 (diff) | |
| parent | 3f8aaec6bd98cbdf6d42591027f1d905f8b6a8f9 (diff) | |
Merge branch 'master' into blender2.8
This discards node drawing changes which need to be written as shaders.
Diffstat (limited to 'source/blender/makesdna/DNA_node_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index de1214e9b3d..016de0f1cc9 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -111,7 +111,7 @@ typedef struct bNodeSocket { short stack_index; /* local stack index */ /* XXX deprecated, kept for forward compatibility */ short stack_type DNA_DEPRECATED; - int pad; + char draw_shape, pad[3]; void *cache; /* cached data from execution */ @@ -143,6 +143,13 @@ typedef enum eNodeSocketDatatype { SOCK_STRING = 7 } eNodeSocketDatatype; +/* socket shape */ +typedef enum eNodeSocketDrawShape { + SOCK_DRAW_SHAPE_CIRCLE = 0, + SOCK_DRAW_SHAPE_SQUARE = 1, + SOCK_DRAW_SHAPE_DIAMOND = 2 +} eNodeSocketDrawShape; + /* socket side (input/output) */ typedef enum eNodeSocketInOut { SOCK_IN = 1, |