From 65d4c58060eae4f544e4e483a38ca2b8d30bd707 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 14 Feb 2022 15:33:47 +0100 Subject: Fix Cycles assert in debug mode after recent changes We sometimes call start() on already started renders, just do nothing then. Ref D14086 --- intern/cycles/session/session.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'intern') 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; } -- cgit v1.2.3