Commit: feb3c74a05f114556fe2339cf96912c7bf7b60f0
Author: Mai Lavelle
Date: Thu Sep 6 00:23:50 2018 -0400
Branches: master
https://developer.blender.org/rBfeb3c74a05f114556fe2339cf96912c7bf7b60f0
Cycles: Allow cancel during displacement of meshes
===================================================================
M intern/cycles/render/mesh.cpp
===================================================================
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) {
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
