diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2018-09-06 07:23:50 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2018-09-06 07:25:35 +0300 |
| commit | feb3c74a05f114556fe2339cf96912c7bf7b60f0 (patch) | |
| tree | 4cc8a99d31c303b60dd899b0f42aa0708773e86b /intern | |
| parent | 94ec80d21cc437c56dde8b8ff04a852810656eb7 (diff) | |
Cycles: Allow cancel during displacement of meshes
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/render/mesh.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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) { |