[Bf-blender-cvs] [3558f565f1e] master: Fix T97498, T97651: crash in Cycles with TBB 2021 after recent changes

Brecht Van Lommel noreply at git.blender.org
Thu Apr 28 00:32:08 CEST 2022


Commit: 3558f565f1e8a8e5dc49067cc0500cbf993af69e
Author: Brecht Van Lommel
Date:   Thu Apr 28 00:21:31 2022 +0200
Branches: master
https://developer.blender.org/rB3558f565f1e8a8e5dc49067cc0500cbf993af69e

Fix T97498, T97651: crash in Cycles with TBB 2021 after recent changes

===================================================================

M	intern/cycles/util/tbb.h

===================================================================

diff --git a/intern/cycles/util/tbb.h b/intern/cycles/util/tbb.h
index 948bf2b3e0e..2b9a8ef135d 100644
--- a/intern/cycles/util/tbb.h
+++ b/intern/cycles/util/tbb.h
@@ -34,7 +34,9 @@ static inline void thread_capture_fp_settings()
 #else
   tbb::task_group_context *ctx = tbb::task::self().group();
 #endif
-  ctx->capture_fp_settings();
+  if (ctx) {
+    ctx->capture_fp_settings();
+  }
 }
 
 static inline void parallel_for_cancel()



More information about the Bf-blender-cvs mailing list