[Bf-blender-cvs] [72ff1ff3054] master: Modifiers: Never copy runtime data pointer

Sergey Sharybin noreply at git.blender.org
Wed Mar 20 14:53:10 CET 2019


Commit: 72ff1ff30548191c86cec8d4dee0de524f5bf57a
Author: Sergey Sharybin
Date:   Wed Mar 20 14:45:01 2019 +0100
Branches: master
https://developer.blender.org/rB72ff1ff30548191c86cec8d4dee0de524f5bf57a

Modifiers: Never copy runtime data pointer

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

M	source/blender/blenkernel/intern/modifier.c

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

diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 189bd8623c4..3cd163bbbf8 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -299,6 +299,9 @@ void modifier_copyData_generic(const ModifierData *md_src, ModifierData *md_dst,
 	char       *md_dst_data =       ((char *)md_dst) + data_size;
 	BLI_assert(data_size <= (size_t)mti->structSize);
 	memcpy(md_dst_data, md_src_data, (size_t)mti->structSize - data_size);
+
+	/* Runtime fields are never to be preserved. */
+	md_dst->runtime = NULL;
 }
 
 static void modifier_copy_data_id_us_cb(void *UNUSED(userData), Object *UNUSED(ob), ID **idpoin, int cb_flag)



More information about the Bf-blender-cvs mailing list