diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-11 02:32:11 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-11 02:55:22 +0300 |
| commit | 69b2f5268114bbb82c06a040e8d7127ea5fdd64e (patch) | |
| tree | 710cb5d4afc167007f68b509ffbcde737553be0b /source/blender/makesdna | |
| parent | ffd0fee97c364866d387718a9ee172466054133b (diff) | |
DNA: remove Object.display struct
We have a display flag already, use it instead.
Object.display is kept in RNA, exposed via a nested struct,
we can move other display options there.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index d91fcac49c1..f951b7273c9 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -114,10 +114,6 @@ typedef struct LodLevel { int obhysteresis; } LodLevel; -typedef struct ObjectDisplay { - int flag; -} ObjectDisplay; - /* Forward declaration for cache bbone deformation information. * * TODO(sergey): Consider moving it to more appropriate place. */ @@ -380,12 +376,8 @@ typedef struct Object { int pad6; int select_color; - /* Runtime evaluation data. */ + /* Runtime evaluation data (keep last). */ Object_Runtime runtime; - - /* Object Display */ - struct ObjectDisplay display; - int pad9; } Object; /* Warning, this is not used anymore because hooks are now modifiers */ @@ -444,11 +436,6 @@ enum { OB_TYPE_MAX, }; -/* ObjectDisplay.flag */ -enum { - OB_SHOW_SHADOW = (1 << 0), -}; - /* check if the object type supports materials */ #define OB_TYPE_SUPPORT_MATERIAL(_type) \ (((_type) >= OB_MESH && (_type) <= OB_MBALL) || ((_type) == OB_GPENCIL)) @@ -545,6 +532,7 @@ enum { /* enable transparent draw */ OB_DRAWTRANSP = 1 << 7, OB_DRAW_ALL_EDGES = 1 << 8, /* only for meshes currently */ + OB_DRAW_NO_SHADOW_CAST = 1 << 9, }; /* empty_drawtype: no flags */ |