diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-02-28 14:59:18 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-02-28 15:01:02 +0300 |
commit | da1140f75e08ac5228474e5cdbb995ec7c0df579 (patch) | |
tree | 0603441863f1ec4537d363217c29be745848b386 /source/blender/makesdna/DNA_object_types.h | |
parent | 7a8a074a30b045eafbef6eeb5293f1e76a3cb5a7 (diff) |
Revert "Objects: make evaluated data runtime storage usable for types other than mesh"
This reverts commit f2b95b9eae2ee913c99cff7595527b18d8b49d0a.
Fix T74283: modifier display lost when moving object in edit mode.
The cause is not immediately obvious so better to revert and look at this
carefully.
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index bfa7400f926..b142939eaeb 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -124,7 +124,7 @@ struct CustomData_MeshMasks; typedef struct Object_Runtime { /** * The custom data layer mask that was last used - * to calculate data_eval and mesh_deform_eval. + * to calculate mesh_eval and mesh_deform_eval. */ CustomData_MeshMasks last_data_mask; @@ -141,25 +141,25 @@ typedef struct Object_Runtime { char _pad1[3]; /** - * Denotes whether the evaluated data is owned by this object or is referenced and owned by + * Denotes whether the evaluated mesh is owned by this object or is referenced and owned by * somebody else. */ - char is_data_eval_owned; + char is_mesh_eval_owned; /** Axis aligned boundbox (in localspace). */ struct BoundBox *bb; /** - * Original data pointer, before object->data was changed to point - * to data_eval. + * Original mesh pointer, before object->data was changed to point + * to mesh_eval. * Is assigned by dependency graph's copy-on-write evaluation. */ - struct ID *data_orig; + struct Mesh *mesh_orig; /** - * Object data structure created during object evaluation. + * Mesh structure created during object evaluation. * It has all modifiers applied. */ - struct ID *data_eval; + struct Mesh *mesh_eval; /** * Mesh structure created during object evaluation. * It has deformation only modifiers applied on it. |