diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-02-13 16:29:27 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-02-13 16:31:56 +0300 |
commit | eb7f2457e589e1a071b2e3f45e1dd9f4ac1d62ed (patch) | |
tree | ce8f0af21355b817ed5a311ee243c4f723b3ef0c /source/blender/blenkernel/intern/mesh.c | |
parent | 5e3838faa2e6dae0ac52860085f5dc4b7a000ea5 (diff) |
Cleanup: do not cleanup runtime data twice during ID copying...
More or less same code was being executed twice during ID copying.
Makes no sense to add yet another switch-by-ID-type to handle
specificaly runtime data during ID copying, we already have
BKE_xxx_copy_data() functions for that.
Diffstat (limited to 'source/blender/blenkernel/intern/mesh.c')
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index fb0ba98c3ed..9a725be302c 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -525,6 +525,14 @@ Mesh *BKE_mesh_add(Main *bmain, const char *name) */ void BKE_mesh_copy_data(Main *bmain, Mesh *me_dst, const Mesh *me_src, const int flag) { + BKE_mesh_runtime_reset_on_copy(me_dst, flag); + if ((me_src->id.tag & LIB_TAG_NO_MAIN) == 0) { + /* This is a direct copy of a main mesh, so for now it has the same topology. */ + me_dst->runtime.deformed_only = true; + } + /* XXX WHAT? Why? Comment, please! And pretty sure this is not valid for regular Mesh copying? */ + me_dst->runtime.is_original = false; + const bool do_tessface = ((me_src->totface != 0) && (me_src->totpoly == 0)); /* only do tessface if we have no polys */ CustomDataMask mask = CD_MASK_MESH; @@ -551,21 +559,6 @@ void BKE_mesh_copy_data(Main *bmain, Mesh *me_dst, const Mesh *me_src, const int me_dst->edit_btmesh = NULL; - /* Call BKE_mesh_runtime_reset? */ - me_dst->runtime.batch_cache = NULL; - me_dst->runtime.looptris.array = NULL; - me_dst->runtime.bvh_cache = NULL; - me_dst->runtime.shrinkwrap_data = NULL; - - if (me_src->id.tag & LIB_TAG_NO_MAIN) { - me_dst->runtime.deformed_only = me_src->runtime.deformed_only; - } - else { - /* This is a direct copy of a main mesh, so for now it has the same topology. */ - me_dst->runtime.deformed_only = 1; - } - me_dst->runtime.is_original = false; - me_dst->mselect = MEM_dupallocN(me_dst->mselect); me_dst->bb = MEM_dupallocN(me_dst->bb); |