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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2017-10-05 00:25:51 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2017-10-05 00:25:51 +0300
commit49199963bf336b4ff210bef9da37889a8ca21eeb (patch)
treedb8d7cc5cab9ddc4b69e62890c96787d9278be34 /intern/cycles/device/device_cuda.cpp
parent6da6f8d33f65b427162d0c8b13a5a5f5043bc8a5 (diff)
Fix incorrect CUDA remaining time estimate after previous commit.
Diffstat (limited to 'intern/cycles/device/device_cuda.cpp')
-rw-r--r--intern/cycles/device/device_cuda.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index d84771aefda..8cfc5332e94 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -1351,7 +1351,7 @@ public:
/* Update progress. */
rtile.sample = sample + wtile->num_samples;
- task.update_progress(&rtile, rtile.w*rtile.h);
+ task.update_progress(&rtile, rtile.w*rtile.h*wtile->num_samples);
if(task.get_cancel()) {
if(task.need_finish_queue == false)