diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-05-30 11:47:20 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-05-30 12:11:03 +0300 |
| commit | 9abbf73d3f668a940c8f4d077ef9bc6db0ca7142 (patch) | |
| tree | 200c767bee6b29768fa3ece7ec283d18d06c7014 /source/blender/blenkernel/intern | |
| parent | a01244cade1c210df2921f44be842e5c6a6c011e (diff) | |
Cleanup: Wrap object runtime eval members into own struct
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 18 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/object_update.c | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 1a491f63249..6fa8caba582 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -341,15 +341,16 @@ void BKE_object_free_derived_caches(Object *ob) ob->derivedDeform = NULL; } - if (ob->mesh_eval != NULL) { + if (ob->runtime.mesh_eval != NULL) { + Mesh *mesh_eval = ob->runtime.mesh_eval; /* Restore initial pointer. */ - ob->data = ob->mesh_eval->id.orig_id; + ob->data = mesh_eval->id.orig_id; /* Evaluated mesh points to edit mesh, but does not own it. */ - ob->mesh_eval->edit_btmesh = NULL; - BKE_mesh_free(ob->mesh_eval); - BKE_libblock_free_data(&ob->mesh_eval->id, false); - MEM_freeN(ob->mesh_eval); - ob->mesh_eval = NULL; + mesh_eval->edit_btmesh = NULL; + BKE_mesh_free(mesh_eval); + BKE_libblock_free_data(&mesh_eval->id, false); + MEM_freeN(mesh_eval); + ob->runtime.mesh_eval = NULL; } BKE_object_free_curve_cache(ob); @@ -2837,8 +2838,7 @@ int BKE_object_obdata_texspace_get(Object *ob, short **r_texflag, float **r_loc, Mesh *BKE_object_get_evaluated_mesh(const Depsgraph *depsgraph, Object *ob) { Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); - - return ob_eval->mesh_eval; + return ob_eval->runtime.mesh_eval; } diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index 0709d01d5ac..5848de3aa87 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -350,7 +350,7 @@ void BKE_object_eval_uber_data(Depsgraph *depsgraph, * explicit way to query final object evaluated data and know for sure * who owns the newly created mesh datablock. */ - ob->mesh_eval = new_mesh; + ob->runtime.mesh_eval = new_mesh; /* TODO(sergey): This is kind of compatibility thing, so all render * engines can use object->data for mesh data for display. This is * something what we might want to change in the future. |