Cycles: Allow cancel during displacement of meshes

2018-09-06 00:23:50 -04:00
parent 94ec80d21c
commit feb3c74a05
1 changed files with 2 additions and 3 deletions
--- 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) {