diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2022-07-26 00:43:48 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2022-07-26 00:43:48 +0300 |
commit | f081e76037432cb926be45e980eac201d337032c (patch) | |
tree | dd1225521c12ea21c0b0c3d51ec1ae3f8730755f /source/blender/makesdna/DNA_object_types.h | |
parent | fa2084ae58a77b1201289b6bedac427f73c762d1 (diff) | |
parent | 462f99bf38648a08226b1fba423315aec2bc577b (diff) |
Merge branch 'master' into geometry-nodes-iterative-cachegeometry-nodes-rigid-body-integration
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index b9d7416ef69..4f57c6fe84f 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -440,7 +440,10 @@ typedef struct Object { char empty_image_visibility_flag; char empty_image_depth; char empty_image_flag; - char _pad8[5]; + + /** ObjectModifierFlag */ + uint8_t modifier_flag; + char _pad8[4]; struct PreviewImage *preview; @@ -794,6 +797,10 @@ enum { OB_EMPTY_IMAGE_USE_ALPHA_BLEND = 1 << 0, }; +typedef enum ObjectModifierFlag { + OB_MODIFIER_FLAG_ADD_REST_POSITION = 1 << 0, +} ObjectModifierFlag; + #define MAX_DUPLI_RECUR 8 #ifdef __cplusplus |