Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-12-17 14:28:16 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-12-17 14:33:37 +0300
commita84c823b891fcf440e134eb284024ea06aa1a9ff (patch)
treeae07aaa5b4d32a8817ffefe96dc6416b0957c27d /source/blender/blenkernel/intern/mesh.c
parentdcc11360c619f51a70466e7b3622cc1aebe08fd9 (diff)
Fix T58652: Crash editing shape keys weirdness with instances
This is a second attempt to get the crash fixed. The original fix worked, but it was reverted by d3e0d7f0825. Now the logic goes as: - All pointers which we can not have shared (the ones which are owned by the runtime) are cleared. - The rest of runtime stays untouched. This seems to be enough to keep particles happy.
Diffstat (limited to 'source/blender/blenkernel/intern/mesh.c')
-rw-r--r--source/blender/blenkernel/intern/mesh.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index 9e4a7372010..fcd0bfa9ceb 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -700,8 +700,7 @@ Mesh *BKE_mesh_copy_for_eval(struct Mesh *source, bool reference)
int flags = (LIB_ID_CREATE_NO_MAIN |
LIB_ID_CREATE_NO_USER_REFCOUNT |
LIB_ID_CREATE_NO_DEG_TAG |
- LIB_ID_COPY_NO_PREVIEW |
- LIB_ID_COPY_RUNTIME);
+ LIB_ID_COPY_NO_PREVIEW);
if (reference) {
flags |= LIB_ID_COPY_CD_REFERENCE;