Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2022-04-28 01:21:31 +0300
committerBrecht Van Lommel <brecht@blender.org>2022-04-28 01:24:13 +0300
commit3558f565f1e8a8e5dc49067cc0500cbf993af69e (patch)
tree187b6269a5d48c01ec3305e6a950eed9557f4021
parent0539208f971fbb271010d6d6a40cb77bef51456b (diff)
Fix T97498, T97651: crash in Cycles with TBB 2021 after recent changes
-rw-r--r--intern/cycles/util/tbb.h4
1 files changed, 3 insertions, 1 deletions
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()