Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-02-17 04:24:08 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-02-17 04:52:53 +0300
commitae2b677dcb5a70f5f58e1da56b4fcf15b12ef851 (patch)
tree93dd1b8a40c6eed9ca8c6845f443f503c142c968 /source/blender/makesdna/DNA_object_types.h
parent0d86259fc8a34c7ae3543008adc16e35d185fdbd (diff)
Cleanup: move object bounding-box into runtime struct
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
-rw-r--r--source/blender/makesdna/DNA_object_types.h18
1 files changed, 9 insertions, 9 deletions
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
@@ -122,6 +122,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.
* Is assigned by dependency graph's copy-on-write evaluation.
@@ -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. */