[Bf-blender-cvs] [9cf5f1e] bake-cycles: ammend to 02fc6ef1 (Cycles changes for shader evaluation to support cancelling via progress cancel callback) as per Brecht's suggestion

[Dalai Felinto]

Commit: 9cf5f1ee622bca21ff23a4a7326d861207d07e0b
Author: Dalai Felinto
Date:   Wed Apr 30 13:09:48 2014 -0300
https://developer.blender.org/rB9cf5f1ee622bca21ff23a4a7326d861207d07e0b

ammend to 02fc6ef1 (Cycles changes for shader evaluation to support
cancelling via progress cancel callback) as per Brecht's suggestion

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

M	intern/cycles/render/mesh_displace.cpp

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

diff --git a/intern/cycles/render/mesh_displace.cpp b/intern/cycles/render/mesh_displace.cpp
index 8354200..661fd9c 100644
--- a/intern/cycles/render/mesh_displace.cpp
+++ b/intern/cycles/render/mesh_displace.cpp
@@ -124,13 +124,16 @@ bool MeshManager::displace(Device *device, DeviceScene *dscene, Scene *scene, Me
 	device->task_add(task);
 	device->task_wait();
 
+	if(progress.get_cancel()) {
+		device->mem_free(d_input);
+		device->mem_free(d_output);
+		return false;
+	}
+
 	device->mem_copy_from(d_output, 0, 1, d_output.size(), sizeof(float4));
 	device->mem_free(d_input);
 	device->mem_free(d_output);
 
-	if(progress.get_cancel())
-		return false;
-
 	/* read result */
 	done.clear();
 	done.resize(mesh->verts.size(), false);