[Bf-blender-cvs] [97aab5a] master: Cycles: Set samples to USHRT_MAX per default in the constructor, this is already used elsewhere.

[Thomas Dinges]

Commit: 97aab5acc4a397c73868b9f960e706153ac73f2e
Author: Thomas Dinges
Date:   Sat Jan 25 19:25:24 2014 +0100
https://developer.blender.org/rB97aab5acc4a397c73868b9f960e706153ac73f2e

Cycles: Set samples to USHRT_MAX per default in the constructor, this is already used elsewhere.

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

M	intern/cycles/render/session.h

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

diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h
index b2ab4cb..1227edf 100644
--- a/intern/cycles/render/session.h
+++ b/intern/cycles/render/session.h
@@ -69,7 +69,7 @@ public:
 
 		progressive = false;
 		experimental = false;
-		samples = INT_MAX;
+		samples = USHRT_MAX;
 		tile_size = make_int2(64, 64);
 		start_resolution = INT_MAX;
 		threads = 0;