diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-12-01 17:38:18 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-12-01 17:38:18 +0300 |
| commit | dbb479b998a63bec22ebc3173b22420c955892dd (patch) | |
| tree | cc763c14e23ff6fbacc94fe1e4e62b98e594a965 /source/blender/collada/collada_utils.cpp | |
| parent | 0606829850a169e1be5d268674f77c016f5640eb (diff) | |
fix: Collada exporter has similar issue as reproted in T58150
Diffstat (limited to 'source/blender/collada/collada_utils.cpp')
| -rw-r--r-- | source/blender/collada/collada_utils.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index f5be93195ab..33f74968782 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -263,7 +263,6 @@ Mesh *bc_get_mesh_copy( bool triangulate) { CustomDataMask mask = CD_MASK_MESH; - Mesh *mesh = (Mesh *)ob->data; Mesh *tmpmesh = NULL; if (apply_modifiers) { #if 0 /* Not supported by new system currently... */ @@ -281,12 +280,13 @@ Mesh *bc_get_mesh_copy( } #else Depsgraph *depsgraph = blender_context.get_depsgraph(); - Scene *scene = blender_context.get_scene(); - tmpmesh = mesh_get_eval_final(depsgraph, scene, ob, mask); + Scene *scene_eval = blender_context.get_evaluated_scene(); + Object *ob_eval = blender_context.get_evaluated_object(ob); + tmpmesh = mesh_get_eval_final(depsgraph, scene_eval, ob_eval, mask); #endif } else { - tmpmesh = mesh; + tmpmesh = (Mesh *)ob->data; } BKE_id_copy_ex(NULL, &tmpmesh->id, (ID **)&tmpmesh, |