Merge branch 'master' into blender2.8

2 files changed, 2 insertions, 2 deletions

diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp
index b3804f34963..2ce65ec055f 100644
--- a/intern/cycles/render/light.cpp
+++ b/intern/cycles/render/light.cpp
@@ -37,7 +37,7 @@ static void shade_background_pixels(Device *device, DeviceScene *dscene, int res
 	int height = res;
 
 	device_vector<uint4> d_input(device, "background_input", MEM_READ_ONLY);
-	device_vector<float4> d_output(device, "background_output", MEM_WRITE_ONLY);
+	device_vector<float4> d_output(device, "background_output", MEM_READ_WRITE);
 
 	uint4 *d_input_data = d_input.alloc(width*height);
 
diff --git a/intern/cycles/render/mesh_displace.cpp b/intern/cycles/render/mesh_displace.cpp
index ab3ae40d931..1f5f0481dec 100644
--- a/intern/cycles/render/mesh_displace.cpp
+++ b/intern/cycles/render/mesh_displace.cpp
@@ -115,7 +115,7 @@ bool MeshManager::displace(Device *device, DeviceScene *dscene, Scene *scene, Me
 		return false;
 	
 	/* run device task */
-	device_vector<float4> d_output(device, "displace_output", MEM_WRITE_ONLY);
+	device_vector<float4> d_output(device, "displace_output", MEM_READ_WRITE);
 	d_output.alloc(d_input_size);
 	d_output.zero_to_device();
 	d_input.copy_to_device();