diff options
author | Brecht Van Lommel <brecht@blender.org> | 2022-02-14 17:33:47 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2022-02-14 17:45:11 +0300 |
commit | 65d4c58060eae4f544e4e483a38ca2b8d30bd707 (patch) | |
tree | c5e046ea2d8bcd89474f7faaafdef815fecce976 /intern | |
parent | 993839ce85137ac37a978f49ae894703a39dbf6a (diff) |
Fix Cycles assert in debug mode after recent changes
We sometimes call start() on already started renders, just do nothing then.
Ref D14086
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/session/session.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/session/session.cpp b/intern/cycles/session/session.cpp index f6e06f20aba..8fcb5c9ac96 100644 --- a/intern/cycles/session/session.cpp +++ b/intern/cycles/session/session.cpp @@ -110,7 +110,10 @@ void Session::start() { /* Signal session thread to start rendering. */ thread_scoped_lock session_thread_lock(session_thread_mutex_); - assert(session_thread_state_ == SESSION_THREAD_WAIT); + if (session_thread_state_ == SESSION_THREAD_RENDER) { + /* Already rendering, nothing to do. */ + return; + } session_thread_state_ = SESSION_THREAD_RENDER; } |