[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51181] trunk/blender/intern/cycles/render /light.cpp: Fix #32815: cycles environment render as lamp crash with resolution >= 1024.

[Brecht Van Lommel]

Revision: 51181
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51181
Author:   blendix
Date:     2012-10-08 12:15:18 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
Fix #32815: cycles environment render as lamp crash with resolution >= 1024.

Modified Paths:
--------------
    trunk/blender/intern/cycles/render/light.cpp

Modified: trunk/blender/intern/cycles/render/light.cpp
===================================================================
--- trunk/blender/intern/cycles/render/light.cpp	2012-10-08 12:02:55 UTC (rev 51180)
+++ trunk/blender/intern/cycles/render/light.cpp	2012-10-08 12:15:18 UTC (rev 51181)
@@ -68,20 +68,15 @@
 	main_task.shader_w = width*height;
 
 	/* disabled splitting for now, there's an issue with multi-GPU mem_copy_from */
-#if 0
 	list<DeviceTask> split_tasks;
 	main_task.split_max_size(split_tasks, 128*128); 
 
 	foreach(DeviceTask& task, split_tasks) {
 		device->task_add(task);
 		device->task_wait();
+		device->mem_copy_from(d_output, task.shader_x, 1, task.shader_w, sizeof(float4));
 	}
-#else
-	device->task_add(main_task);
-	device->task_wait();
-#endif
 
-	device->mem_copy_from(d_output, 0, 1, d_output.size(), sizeof(float4));
 	device->mem_free(d_input);
 	device->mem_free(d_output);