From ae2b677dcb5a70f5f58e1da56b4fcf15b12ef851 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 17 Feb 2019 12:24:08 +1100 Subject: Cleanup: move object bounding-box into runtime struct --- source/blender/makesdna/DNA_object_types.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'source/blender/makesdna/DNA_object_types.h') diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index f951b7273c9..b79009e9d1d 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -121,6 +121,15 @@ struct ObjectBBoneDeform; /* Not saved in file! */ typedef struct Object_Runtime { + /** + * The custom data layer mask that was last used + * to calculate mesh_eval and mesh_deform_eval. + */ + uint64_t last_data_mask; + + /** Axis aligned boundbox (in localspace). */ + struct BoundBox *bb; + /** * Original mesh pointer, before object->data was changed to point * to mesh_eval. @@ -138,7 +147,6 @@ typedef struct Object_Runtime { */ struct Mesh *mesh_deform_eval; - /** Runtime evaluated curve-specific data, not stored in the file. */ struct CurveCache *curve_cache; @@ -147,12 +155,6 @@ typedef struct Object_Runtime { struct ObjectBBoneDeform *cached_bbone_deformation; - /** - * The custom data layer mask that was last used - * to calculate mesh_eval and mesh_deform_eval. - */ - uint64_t last_data_mask; - /** Did last modifier stack generation need mapping support? */ char last_need_mapping; char pad[7]; @@ -179,8 +181,6 @@ typedef struct Object { /** Old animation system, deprecated for 2.5. */ struct Ipo *ipo DNA_DEPRECATED; /* struct Path *path; */ - /** Axis aligned boundbox (in localspace). */ - struct BoundBox *bb; struct bAction *action DNA_DEPRECATED; // XXX deprecated... old animation system struct bAction *poselib; /** Pose data, armature objects only. */ -- cgit v1.2.3