diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-06 07:42:59 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-06 07:43:47 +0300 |
| commit | 1f22ef34bbb13e17dd5e4f4c573bdcccc146fb3a (patch) | |
| tree | 46242e35b1f990c7ab3e12bb72bc6911892ae939 /intern | |
| parent | 31026f8c0e17b04f823b0fae808065b66841af6d (diff) | |
| parent | f5daa58242a1b42fea7a15039968499318978842 (diff) | |
Merge branch 'master' into blender2.8
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) { |