[Bf-blender-cvs] [76b5e38a76e] blender2.8: Mesh: Set deformed_only=1 when copied mesh is from main library

Sybren A. Stüvel noreply at git.blender.org
Wed May 16 16:14:12 CEST 2018


Commit: 76b5e38a76ecac4522edc72f310c88428cc2d23a
Author: Sybren A. Stüvel
Date:   Wed May 16 14:33:14 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB76b5e38a76ecac4522edc72f310c88428cc2d23a

Mesh: Set deformed_only=1 when copied mesh is from main library

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

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

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

diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index efafdf949dc..266247d5143 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -553,7 +553,14 @@ void BKE_mesh_copy_data(Main *bmain, Mesh *me_dst, const Mesh *me_src, const int
 	me_dst->edit_btmesh = NULL;
 	me_dst->runtime.batch_cache = NULL;
 	me_dst->runtime.bvh_cache = NULL;
-	me_dst->runtime.deformed_only = me_src->runtime.deformed_only;
+
+	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->mselect = MEM_dupallocN(me_dst->mselect);
 	me_dst->bb = MEM_dupallocN(me_dst->bb);



More information about the Bf-blender-cvs mailing list