[Bf-blender-cvs] [49199963bf3] master: Fix incorrect CUDA remaining time estimate after previous commit.
Brecht Van Lommel
noreply at git.blender.org
Wed Oct 4 23:26:31 CEST 2017
Commit: 49199963bf336b4ff210bef9da37889a8ca21eeb
Author: Brecht Van Lommel
Date: Wed Oct 4 23:25:51 2017 +0200
Branches: master
https://developer.blender.org/rB49199963bf336b4ff210bef9da37889a8ca21eeb
Fix incorrect CUDA remaining time estimate after previous commit.
===================================================================
M intern/cycles/device/device_cuda.cpp
===================================================================
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)
More information about the Bf-blender-cvs
mailing list