diff options
author | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
---|---|---|
committer | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
commit | 00dcfdf916c69672210b006e62d966f1bc2fbeb7 (patch) | |
tree | 0cbb1b91fe26c750197126085b74224a795a103c /source/blender/makesdna/DNA_object_types.h | |
parent | a39532670f6b668da7be5810fb1f844b82feeba3 (diff) | |
parent | d5934974219135102f364f57c45a8b1465e2b8d9 (diff) |
Merge branch 'master' into xr-devxr-dev
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 698fbe8ee8f..add11d61db8 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -215,6 +215,10 @@ typedef struct ObjectLineArt { /** if OBJECT_LRT_OWN_CREASE is set */ float crease_threshold; + + unsigned char intersection_priority; + + char _pad[7]; } ObjectLineArt; /** @@ -231,6 +235,7 @@ enum eObjectLineArt_Usage { enum eObjectLineArt_Flags { OBJECT_LRT_OWN_CREASE = (1 << 0), + OBJECT_LRT_OWN_INTERSECTION_PRIORITY = (1 << 1), }; typedef struct Object { @@ -429,7 +434,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; @@ -469,7 +477,13 @@ typedef struct ObHook { /* **************** OBJECT ********************* */ -/* used many places, should be specialized. */ +/** + * This is used as a flag for many kinds of data that use selections, examples include: + * - #BezTriple.f1, #BezTriple.f2, #BezTriple.f3 + * - #bNote.flag + * - #MovieTrackingTrack.flag + * And more, ideally this would have a generic location. + */ #define SELECT 1 /** #Object.type */ @@ -783,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 |