[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58426] trunk/blender/intern/cycles: Code cleanup / Cycles:

[Thomas Dinges]

Revision: 58426
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58426
Author:   dingto
Date:     2013-07-19 22:56:54 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
Code cleanup / Cycles:
* Use USHRT_MAX rather than manual value, suggested by Campbell. 

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 22:54:02 UTC (rev 58425)
+++ trunk/blender/intern/cycles/blender/blender_sync.cpp	2013-07-19 22:56:54 UTC (rev 58426)
@@ -428,7 +428,7 @@
 		else {
 			params.samples = preview_aa_samples;
 			if(params.samples == 0)
-				params.samples = 65536;
+				params.samples = USHRT_MAX;
 		}
 	}
 	else {
@@ -438,7 +438,7 @@
 		else {
 			params.samples = preview_samples;
 			if(params.samples == 0)
-				params.samples = 65536;
+				params.samples = USHRT_MAX;
 		}
 	}
 

Modified: trunk/blender/intern/cycles/render/session.cpp
===================================================================
--- trunk/blender/intern/cycles/render/session.cpp	2013-07-19 22:54:02 UTC (rev 58425)
+++ trunk/blender/intern/cycles/render/session.cpp	2013-07-19 22:56:54 UTC (rev 58426)
@@ -786,7 +786,7 @@
 			substatus += string_printf(", Sample %d/%d", sample, num_samples);
 		}
 	}
-	else if(tile_manager.num_samples == 65536)
+	else if(tile_manager.num_samples == USHRT_MAX)
 		substatus = string_printf("Path Tracing Sample %d", sample+1);
 	else
 		substatus = string_printf("Path Tracing Sample %d/%d", sample+1, tile_manager.num_samples);