Code cleanup / Cycles:

* Use USHRT_MAX rather than manual value, suggested by Campbell. 

2 files changed, 3 insertions, 3 deletions

diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index 10a17b7abc3..11e2be5e0fb 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -428,7 +428,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use
 		else {
 			params.samples = preview_aa_samples;
 			if(params.samples == 0)
-				params.samples = 65536;
+				params.samples = USHRT_MAX;
 		}
 	}
 	else {
@@ -438,7 +438,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use
 		else {
 			params.samples = preview_samples;
 			if(params.samples == 0)
-				params.samples = 65536;
+				params.samples = USHRT_MAX;
 		}
 	}
 
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 9ff2b91e25e..93d57c65363 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -786,7 +786,7 @@ void Session::update_status_time(bool show_pause, bool show_done)
 			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);