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:
authorCampbell Barton <ideasman42@gmail.com>2018-02-19 09:46:42 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-02-19 09:46:42 +0300
commit264691e5630fcd11516272c98bcdf2a2c980dfa3 (patch)
treedd4e72696dc2c9f4ff478339ccca8cf714eb1e03 /source/blender/blenkernel/intern/scene.c
parent34e76c7162de721e73262efe138ac28f74936eec (diff)
parent860939ccc2c11f0503588d35e2b23326997c9768 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
-rw-r--r--source/blender/blenkernel/intern/scene.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 932f80c35d5..899a911270f 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1396,7 +1396,11 @@ static void prepare_mesh_for_viewport_render(Main *bmain, const EvaluationContex
{
if (check_rendered_viewport_visible(bmain)) {
BMesh *bm = mesh->edit_btmesh->bm;
- BM_mesh_bm_to_me(bm, mesh, (&(struct BMeshToMeshParams){0}));
+ BM_mesh_bm_to_me(
+ bm, mesh,
+ (&(struct BMeshToMeshParams){
+ .calc_object_remap = true,
+ }));
DEG_id_tag_update(&mesh->id, 0);
}
}