[Bf-blender-cvs] [44c9052] temp-cycles-microdisplacement: Allow subpatch bounds computation to be canceled

[Mai Lavelle]

Commit: 44c905268e63c789aead422510f34b1daaea44c8
Author: Mai Lavelle
Date:   Mon Apr 11 16:01:01 2016 -0400
Branches: temp-cycles-microdisplacement
https://developer.blender.org/rB44c905268e63c789aead422510f34b1daaea44c8

Allow subpatch bounds computation to be canceled

===================================================================

M	intern/cycles/render/mesh.cpp

===================================================================

diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp
index d3b075b..c80e8a5 100644
--- a/intern/cycles/render/mesh.cpp
+++ b/intern/cycles/render/mesh.cpp
@@ -1438,6 +1438,8 @@ void MeshManager::device_update(Device *device, DeviceScene *dscene, Scene *scen
 			progress.set_status("Updating Mesh", msg);
 
 			for(int i = 0; i < mesh->subpatches.size(); i++) {
+				if(progress.get_cancel()) return;
+
 				Mesh::SubPatch* subpatch = &mesh->subpatches[i];
 
 				// calculate subpatch size