diff options
| author | Thomas Dinges <blender@dingto.org> | 2022-02-14 19:48:52 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2022-02-14 19:48:52 +0300 |
| commit | 19403fc852224b2c29df3e5f1f2106ba91f105a2 (patch) | |
| tree | 59818c3cf9e14fbfa2e54ee8817bf1d8b78ea07c /intern/cycles/session/session.cpp | |
| parent | d8e2f612ec52ce0272cbc8a5e9ff0c6b89ce16a6 (diff) | |
| parent | a5edff4b73ba74155dcad93103e2fef2c59df67f (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'intern/cycles/session/session.cpp')
| -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 ea669ab6557..4d9d0388a15 100644 --- a/intern/cycles/session/session.cpp +++ b/intern/cycles/session/session.cpp @@ -97,7 +97,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; } |