diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-08-06 19:34:41 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-08-06 20:19:22 +0300 |
| commit | 8123b1200674556f42e4c229de517d6ed85ea698 (patch) | |
| tree | 1153ea19180ade8fb8cfbc52467b1396ce6ae13e | |
| parent | 8fbfc150a097731c9a7a66a1c61a6d5a66973f14 (diff) | |
Fix T79586: "rendering paused" not shown when viewport render starts paused
| -rw-r--r-- | intern/cycles/blender/blender_session.cpp | 5 | ||||
| -rw-r--r-- | intern/cycles/render/session.cpp | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index ca363802919..a06030c8b7d 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -59,6 +59,7 @@ BlenderSession::BlenderSession(BL::RenderEngine &b_engine, BL::BlendData &b_data, bool preview_osl) : session(NULL), + scene(NULL), sync(NULL), b_engine(b_engine), b_userpref(b_userpref), @@ -88,6 +89,7 @@ BlenderSession::BlenderSession(BL::RenderEngine &b_engine, int width, int height) : session(NULL), + scene(NULL), sync(NULL), b_engine(b_engine), b_userpref(b_userpref), @@ -970,7 +972,8 @@ void BlenderSession::update_status_progress() remaining_time = (1.0 - (double)progress) * (render_time / (double)progress); if (background) { - scene_status += " | " + scene->name; + if (scene) + scene_status += " | " + scene->name; if (b_rlay_name != "") scene_status += ", " + b_rlay_name; 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) |