From a51e9ece538fb00c939ccaca7d6fbb1fe491bf10 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 6 Apr 2016 16:30:52 +0200 Subject: [PATCH] Cycles: Fix misleading remaining time report when using infinite number of samples in viewport --- intern/cycles/blender/blender_session.cpp | 2 +- intern/cycles/render/session.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 92b5b7277f4..3e7fba01137 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -936,7 +936,7 @@ void BlenderSession::get_progress(float& progress, double& total_time, double& r if(background && samples_per_tile && tile_total) progress = ((float)sample / (float)(tile_total * samples_per_tile)); - else if(!background && samples > 0 && total_samples != USHRT_MAX) + else if(!background && samples > 0 && total_samples != INT_MAX) progress = ((float)samples) / total_samples; else progress = 0.0; 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;