From feb3c74a05f114556fe2339cf96912c7bf7b60f0 Mon Sep 17 00:00:00 2001 From: Mai Lavelle Date: Thu, 6 Sep 2018 00:23:50 -0400 Subject: Cycles: Allow cancel during displacement of meshes --- intern/cycles/render/mesh.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'intern') diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp index ade575a52d6..8a00b88af12 100644 --- a/intern/cycles/render/mesh.cpp +++ b/intern/cycles/render/mesh.cpp @@ -2162,10 +2162,9 @@ void MeshManager::device_update(Device *device, DeviceScene *dscene, Scene *scen num_bvh++; } } - } - /* TODO: properly handle cancel halfway displacement */ - if(progress.get_cancel()) return; + if(progress.get_cancel()) return; + } /* Device re-update after displacement. */ if(displacement_done) { -- cgit v1.2.3