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/object.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/object.c')
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index fe04fa6172f..91ecc8dd74a 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1323,7 +1323,7 @@ void BKE_object_copy_data(Main *bmain, Object *ob_dst, const Object *ob_src, con ShaderFxData *fx; /* Do not copy runtime data. */ - BKE_object_runtime_reset(ob_dst); + BKE_object_runtime_reset_on_copy(ob_dst, flag); /* We never handle usercount here for own data. */ const int flag_subdata = flag | LIB_ID_CREATE_NO_USER_REFCOUNT; @@ -3555,7 +3555,7 @@ void BKE_object_runtime_reset(Object *object) } /* Reset all pointers which we don't want to be shared when copying the object. */ -void BKE_object_runtime_reset_on_copy(Object *object) +void BKE_object_runtime_reset_on_copy(Object *object, const int UNUSED(flag)) { Object_Runtime *runtime = &object->runtime; runtime->mesh_eval = NULL; |