Merge branch 'blender-v2.82-release'

1 files changed, 8 insertions, 0 deletions

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index d2af282f9a4..82c45b4fe64 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -38,6 +38,14 @@ blender_include_dirs(
 )
 
 set(LIB
+  # This forces TBB libraries to be in front of MKL (which is a part of OpenImageDenoise).
+  #
+  # The need of this comes to need to ensure static libraries initialization order, making it
+  # so TBB is initialized prior to MKL (or any other dpeendnecy).
+  #
+  # This isn't fully robust but seems to work.
+  ${TBB_LIBRARIES}
+
   bf_windowmanager
 )