diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2018-07-10 15:14:55 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2018-07-10 16:31:34 +0300 |
commit | 873d7f7e14e080f75e75ed7c6c07f326e588cecb (patch) | |
tree | b0147308da930199bbdfea7a2cc4a5c17938b10f /source/blender/makesdna/DNA_object_types.h | |
parent | dfd192ce41f7e4923db0642f22a587862656bbdd (diff) |
DrawData: Change drawdata to a generic struct shared accross ID types
This makes tagging much more generic and make the world updates more in
line with the new tagging system (Depsgraph).
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 3bcc0fb6dcc..999ebe0ccc3 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -76,22 +76,6 @@ typedef struct bFaceMap { char pad[7]; } bFaceMap; -/* Object Runtime display data */ -struct ObjectEngineData; -typedef void (*ObjectEngineDataInitCb)(struct ObjectEngineData *engine_data); -typedef void (*ObjectEngineDataFreeCb)(struct ObjectEngineData *engine_data); - -# -# -typedef struct ObjectEngineData { - struct ObjectEngineData *next, *prev; - struct DrawEngineType *engine_type; - /* Only nested data, NOT the engine data itself. */ - ObjectEngineDataFreeCb free; - /* Accumulated recalc flags, which corresponds to ID->recalc flags. */ - int recalc; -} ObjectEngineData; - #define MAX_VGROUP_NAME 64 /* bDeformGroup->flag */ @@ -163,6 +147,7 @@ typedef struct Object_Runtime { typedef struct Object { ID id; struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ + struct DrawDataList drawdata; /* runtime (must be immediately after id for utilities to use it). */ struct SculptSession *sculpt; @@ -312,7 +297,6 @@ typedef struct Object { struct PreviewImage *preview; - ListBase drawdata; /* runtime, ObjectEngineData */ int pad6; int select_color; |