diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-02-05 01:31:25 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-02-05 01:48:23 +0300 |
| commit | 031181a6b54a87d9a08399892df691882b9fbc09 (patch) | |
| tree | befe8435ba019c4db903a7d22475aacdf11d0b66 /source/blender/makesdna | |
| parent | df349a22140525820a4ee30caff9aebfc7bc1696 (diff) | |
| parent | dc85776b8b62078c53cf701a4e212bc789bfdc0c (diff) | |
Merge branch 'master' into eevee-rewrite
# Conflicts:
# source/blender/gpu/intern/gpu_shader_dependency.cc
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index 764db6d52a5..962040108ba 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -503,8 +503,10 @@ typedef struct bNodeTree { /** Information about how inputs and outputs of the node group interact with fields. */ FieldInferencingInterfaceHandle *field_inferencing_interface; - /** Set init on fileread. */ - int type, init; + int type; + + char _pad1[4]; + /** * Sockets in groups have unique identifiers, adding new sockets always * will increase this counter. @@ -588,9 +590,6 @@ typedef struct bNodeTree { #define NTREE_TEXTURE 2 #define NTREE_GEOMETRY 3 -/** #NodeTree.init, flag */ -#define NTREE_TYPE_INIT 1 - /** #NodeTree.flag */ #define NTREE_DS_EXPAND (1 << 0) /* for animation editors */ #define NTREE_COM_OPENCL (1 << 1) /* use opencl */ |