[Bf-blender-cvs] [681089237e] cycles_split_kernel: Cycles: Reenable debug tile size for viewport rendering

[Mai Lavelle]

Commit: 681089237e33d2fe4b1c46e4a8368c686e60be34
Author: Mai Lavelle
Date:   Tue Feb 21 03:10:48 2017 -0500
Branches: cycles_split_kernel
https://developer.blender.org/rB681089237e33d2fe4b1c46e4a8368c686e60be34

Cycles: Reenable debug tile size for viewport rendering

Not a problem now that split kernel global size is decoupled from tile size.

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

M	intern/cycles/blender/blender_sync.cpp

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

diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index f8a3400e82..d8043105cd 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -653,13 +653,6 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine& b_engine,
 	}
 
 	/* tiles */
-	/* TODO(mai): Currently the debug_tile_size is really large and without
-	 * automatic tile splitting running out of memory with the split kernel
-	 * is very likely, so for now we just use the user supplied tile size.
-	 *
-	 * This can be reenabled after we find a solution to the memory issues.
-	 */
-#if 0
 	if(params.device.type != DEVICE_CPU && !background) {
 		/* currently GPU could be much slower than CPU when using tiles,
 		 * still need to be investigated, but meanwhile make it possible
@@ -669,9 +662,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine& b_engine,
 
 		params.tile_size = make_int2(debug_tile_size, debug_tile_size);
 	}
-	else
-#endif
-	{
+	else {
 		int tile_x = b_engine.tile_x();
 		int tile_y = b_engine.tile_y();