diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-07-30 17:54:40 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-07-30 17:58:44 +0300 |
| commit | a3b6ae9fb9dd76538ec04b9fa6953490d321dd32 (patch) | |
| tree | 0bce9a5d00551e94b15e5195c7a80370ff6f788f /source/blender/makesdna | |
| parent | 6d6deeb70086564418368a5213cd9d28cdfa51e2 (diff) | |
Cleanup/Refactor: Move CurveCache runtime data into Object.runtime struct.
Also, fix missing cleanup of Object.runtime when copying Object
datablocks!
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index edc87c492a6..a8d50543e80 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -142,6 +142,10 @@ typedef struct Object_Runtime { * It has deforemation only modifiers applied on it. */ struct Mesh *mesh_deform_eval; + + + /* Runtime evaluated curve-specific data, not stored in the file. */ + struct CurveCache *curve_cache; } Object_Runtime; typedef struct Object { @@ -280,9 +284,6 @@ typedef struct Object { uint64_t lastDataMask; /* the custom data layer mask that was last used to calculate derivedDeform and derivedFinal */ uint64_t customdata_mask; /* (extra) custom data layer mask to use for creating derivedmesh, set by depsgraph */ - /* Runtime valuated curve-specific data, not stored in the file */ - struct CurveCache *curve_cache; - ListBase pc_ids; struct RigidBodyOb *rigidbody_object; /* settings for Bullet rigid body */ |