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 <brecht@blender.org>2020-08-06 19:34:41 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-08-06 20:19:22 +0300
commit8123b1200674556f42e4c229de517d6ed85ea698 (patch)
tree1153ea19180ade8fb8cfbc52467b1396ce6ae13e /intern/cycles/render/session.cpp
parent8fbfc150a097731c9a7a66a1c61a6d5a66973f14 (diff)
Fix T79586: "rendering paused" not shown when viewport render starts paused
Diffstat (limited to 'intern/cycles/render/session.cpp')
-rw-r--r--intern/cycles/render/session.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index c5033359c6b..08a8cb08254 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -945,8 +945,14 @@ void Session::set_pause(bool pause_)
}
}
- if (notify)
- pause_cond.notify_all();
+ if (session_thread) {
+ if (notify) {
+ pause_cond.notify_all();
+ }
+ }
+ else if (pause_) {
+ update_status_time(pause_);
+ }
}
void Session::set_denoising(const DenoiseParams &denoising)