[Bf-blender-cvs] [d7ba8611e29] blender2.8: Fix crash with shape keys and modifier stack, after recent changes.

[Brecht Van Lommel]

Commit: d7ba8611e29a7cc188b3297a74338905f5dfa491
Author: Brecht Van Lommel
Date:   Fri May 18 15:10:48 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBd7ba8611e29a7cc188b3297a74338905f5dfa491

Fix crash with shape keys and modifier stack, after recent changes.

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

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

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

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index abbfa4b7ff1..bcb45b199d2 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -827,8 +827,9 @@ void DM_to_mesh(DerivedMesh *dm, Mesh *me, Object *ob, CustomDataMask mask, bool
 	 * stack */
 	if (tmp.totvert != me->totvert && !did_shapekeys && me->key) {
 		printf("%s: YEEK! this should be recoded! Shape key loss!: ID '%s'\n", __func__, tmp.id.name);
-		if (tmp.key)
+		if (tmp.key && !(tmp.id.tag & LIB_TAG_NO_MAIN)) {
 			id_us_min(&tmp.key->id);
+		}
 		tmp.key = NULL;
 	}