Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-04-06 17:30:52 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-04-06 17:30:52 +0300
commita51e9ece538fb00c939ccaca7d6fbb1fe491bf10 (patch)
tree3124592d7553123fe524357cef84192a6aae3c9c /intern/cycles/render/session.h
parentd6ae94b9885d260f058da057b5a47762680d32c9 (diff)
Cycles: Fix misleading remaining time report when using infinite number of samples in viewport
Diffstat (limited to 'intern/cycles/render/session.h')
-rw-r--r--intern/cycles/render/session.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h
index c669bccd34b..02d97ce9a87 100644
--- a/intern/cycles/render/session.h
+++ b/intern/cycles/render/session.h
@@ -72,7 +72,7 @@ public:
progressive = false;
experimental = false;
- samples = USHRT_MAX;
+ samples = INT_MAX;
tile_size = make_int2(64, 64);
start_resolution = INT_MAX;
threads = 0;