[Bf-blender-cvs] [29d9bb89ce3] master: Cleanup: Remove redundant DNA C++ helper function

[Sergey Sharybin]

Commit: 29d9bb89ce34ead28a3e470edec77f8ab8d1a472
Author: Sergey Sharybin
Date:   Tue Mar 29 10:06:34 2022 +0200
Branches: master
https://developer.blender.org/rB29d9bb89ce34ead28a3e470edec77f8ab8d1a472

Cleanup: Remove redundant DNA C++ helper function

Use shallow_copy, no need in copy_memory.

The latter appeared as some last minute solution for a compilation
warning on Friday.

===================================================================

M	source/blender/blenkernel/intern/mesh_convert.cc
M	source/blender/makesdna/DNA_defs.h

===================================================================

diff --git a/source/blender/blenkernel/intern/mesh_convert.cc b/source/blender/blenkernel/intern/mesh_convert.cc
index dc9ec002d1a..abf106164f7 100644
--- a/source/blender/blenkernel/intern/mesh_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_convert.cc
@@ -913,7 +913,7 @@ static void curve_to_mesh_eval_ensure(Object &object)
   Object bevel_object;
   blender::dna::zero_memory(bevel_object);
   if (curve.bevobj != nullptr) {
-    blender::dna::copy_memory(bevel_object, *curve.bevobj);
+    bevel_object = blender::dna::shallow_copy(*curve.bevobj);
     BLI_listbase_clear(&bevel_object.modifiers);
     BKE_object_runtime_reset(&bevel_object);
     curve.bevobj = &bevel_object;
@@ -923,7 +923,7 @@ static void curve_to_mesh_eval_ensure(Object &object)
   Object taper_object;
   blender::dna::zero_memory(taper_object);
   if (curve.taperobj != nullptr) {
-    blender::dna::copy_memory(taper_object, *curve.taperobj);
+    taper_object = blender::dna::shallow_copy(*curve.taperobj);
     BLI_listbase_clear(&taper_object.modifiers);
     BKE_object_runtime_reset(&taper_object);
     curve.taperobj = &taper_object;
@@ -1067,8 +1067,7 @@ static Mesh *mesh_new_from_mesh_object_with_layers(Depsgraph *depsgraph,
     return nullptr;
   }
 
-  Object object_for_eval;
-  blender::dna::copy_memory(object_for_eval, *object);
+  Object object_for_eval = blender::dna::shallow_copy(*object);
   if (object_for_eval.runtime.data_orig != nullptr) {
     object_for_eval.data = object_for_eval.runtime.data_orig;
   }
diff --git a/source/blender/makesdna/DNA_defs.h b/source/blender/makesdna/DNA_defs.h
index bfeb809b369..79477a56695 100644
--- a/source/blender/makesdna/DNA_defs.h
+++ b/source/blender/makesdna/DNA_defs.h
@@ -133,13 +133,6 @@ template<class T> inline void zero_memory(T &object)
   _DNA_internal_memzero(&object, sizeof(T));
 }
 
-/* Copy memory from one DNA object to another. */
-template<class T> inline void copy_memory(T &dst, const T &src)
-{
-  /* TODO(sergey): Consider adding static assert for T being a trivial type. */
-  _DNA_internal_memcpy(&dst, &src, sizeof(T));
-}
-
 }  // namespace blender::dna
 
 #endif