diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-17 14:28:16 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-17 14:33:37 +0300 |
commit | a84c823b891fcf440e134eb284024ea06aa1a9ff (patch) | |
tree | ae07aaa5b4d32a8817ffefe96dc6416b0957c27d /source/blender/blenkernel/BKE_object.h | |
parent | dcc11360c619f51a70466e7b3622cc1aebe08fd9 (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/BKE_object.h')
-rw-r--r-- | source/blender/blenkernel/BKE_object.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 7a595511892..fbef5b6485c 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -319,6 +319,7 @@ void BKE_object_data_relink(struct Object *ob); struct MovieClip *BKE_object_movieclip_get(struct Scene *scene, struct Object *ob, bool use_default); void BKE_object_runtime_reset(struct Object *object); +void BKE_object_runtime_reset_on_copy(struct Object *object); void BKE_object_batch_cache_dirty_tag(struct Object *ob); |