diff options
| author | Alexander Gavrilov <angavrilov@gmail.com> | 2018-12-01 19:06:44 +0300 |
|---|---|---|
| committer | Alexander Gavrilov <angavrilov@gmail.com> | 2018-12-01 19:09:09 +0300 |
| commit | 9ed522db735b1d798a5d68c6bf547e8123d33a4b (patch) | |
| tree | b8e08f92ea02f1a6e73c2883e5f55d296cd3cadf /source/blender/blenkernel/intern/mesh_convert.c | |
| parent | dbb479b998a63bec22ebc3173b22420c955892dd (diff) | |
Fix more cases of evaluated mesh being built for non-COW objects.
Diffstat (limited to 'source/blender/blenkernel/intern/mesh_convert.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh_convert.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c index eed02dae824..de131b9be47 100644 --- a/source/blender/blenkernel/intern/mesh_convert.c +++ b/source/blender/blenkernel/intern/mesh_convert.c @@ -815,10 +815,12 @@ void BKE_mesh_to_curve_nurblist(const Mesh *me, ListBase *nurblist, const int ed } } -void BKE_mesh_to_curve(Main *bmain, Depsgraph *depsgraph, Scene *scene, Object *ob) +void BKE_mesh_to_curve(Main *bmain, Depsgraph *depsgraph, Scene *UNUSED(scene), Object *ob) { /* make new mesh data from the original copy */ - Mesh *me_eval = mesh_get_eval_final(depsgraph, scene, ob, CD_MASK_MESH); + Scene *scene_eval = DEG_get_evaluated_scene(depsgraph); + Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Mesh *me_eval = mesh_get_eval_final(depsgraph, scene_eval, ob_eval, CD_MASK_MESH); ListBase nurblist = {NULL, NULL}; BKE_mesh_to_curve_nurblist(me_eval, &nurblist, 0); |