diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-14 18:07:29 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-14 18:07:59 +0300 |
| commit | f85b05111fa4b96228a4a3969945c80fbb67f499 (patch) | |
| tree | 576fdfe510487142415f40864600e894472a2391 /source/blender/modifiers | |
| parent | 233b7806354f27a52fb1aee672c7c58149d0b4a4 (diff) | |
Fix T59334: Crash initializing crazyspace on object with subsurf and displacement
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_util.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c index db6c58d468a..dca2d536a5d 100644 --- a/source/blender/modifiers/intern/MOD_util.c +++ b/source/blender/modifiers/intern/MOD_util.c @@ -50,6 +50,7 @@ #include "BKE_lattice.h" #include "BKE_library.h" #include "BKE_mesh.h" +#include "BKE_object.h" #include "BKE_modifier.h" @@ -190,8 +191,9 @@ Mesh *MOD_deform_mesh_eval_get( else { /* TODO(sybren): after modifier conversion of DM to Mesh is done, check whether * we really need a copy here. Maybe the CoW ob->data can be directly used. */ + Mesh *mesh_prior_modifiers = BKE_object_get_pre_modified_mesh(ob); BKE_id_copy_ex( - NULL, ob->data, (ID **)&mesh, + NULL, &mesh_prior_modifiers->id, (ID **)&mesh, (LIB_ID_CREATE_NO_MAIN | LIB_ID_CREATE_NO_USER_REFCOUNT | LIB_ID_CREATE_NO_DEG_TAG | |