[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58406] trunk/blender/intern/cycles: Fix for [#36216] Viewport render with CMJ sampler and unlimited passes freezes

[Thomas Dinges]

Revision: 58406
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58406
Author:   dingto
Date:     2013-07-19 14:00:53 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
Fix for [#36216] Viewport render with CMJ sampler and unlimited passes freezes 
* If Preview Samples are set to 0 (unlimited) it now assumes 65536 instead of INT_MAX. 

This doesn't affect regular sampling, you can still enter fixed values of 100k or whatever. 

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

Modified: trunk/blender/intern/cycles/blender/blender_sync.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_sync.cpp	2013-07-19 12:45:43 UTC (rev 58405)
+++ trunk/blender/intern/cycles/blender/blender_sync.cpp	2013-07-19 14:00:53 UTC (rev 58406)
@@ -392,7 +392,7 @@
 		else {
 			params.samples = get_int(cscene, "preview_aa_samples");
 			if(params.samples == 0)
-				params.samples = INT_MAX;
+				params.samples = 65536;
 		}
 	}
 	else {
@@ -402,7 +402,7 @@
 		else {
 			params.samples = get_int(cscene, "preview_samples");
 			if(params.samples == 0)
-				params.samples = INT_MAX;
+				params.samples = 65536;
 		}
 	}
 

Modified: trunk/blender/intern/cycles/render/session.cpp
===================================================================
--- trunk/blender/intern/cycles/render/session.cpp	2013-07-19 12:45:43 UTC (rev 58405)
+++ trunk/blender/intern/cycles/render/session.cpp	2013-07-19 14:00:53 UTC (rev 58406)
@@ -786,7 +786,7 @@
 			substatus += string_printf(", Sample %d/%d", sample, num_samples);
 		}
 	}
-	else if(tile_manager.num_samples == INT_MAX)
+	else if(tile_manager.num_samples == 65536)
 		substatus = string_printf("Path Tracing Sample %d", sample+1);
 	else
 		substatus = string_printf("Path Tracing Sample %d/%d", sample+1, tile_manager.num_samples);