diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-07-23 12:28:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-23 12:28:28 +0400 |
| commit | 28299d98fb93e87b2322d0533395254e2792a86f (patch) | |
| tree | b32d6cff39d1cc5f31bfa1201b623dd24dde04ff /intern/cycles/blender/blender_sync.cpp | |
| parent | 4a999f9e96965bd4aa45ce4cdd5c225bbf901226 (diff) | |
svn merge ^/trunk/blender -c58374 -c58406 -c58422 -c58427 -c58436 -c58440 -c58441 -c58463 -c58504 -c58509 -c58512 -c58513 -c58514 -c58516 -c58520 -c58532 -c58534v2.68a
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 72ed1b84915..e9e39e485f5 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -392,7 +392,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use 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 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use else { params.samples = get_int(cscene, "preview_samples"); if(params.samples == 0) - params.samples = INT_MAX; + params.samples = 65536; } } |