Merge branch 'blender-v2.81-release'

2019-10-29 19:30:24 +11:00
parent 2dab4393b0 7cc489a2c8
commit 51ac654b3f
1 changed files with 3 additions and 0 deletions
--- a/source/blender/blenkernel/intern/pbvh_parallel.cc
+++ b/source/blender/blenkernel/intern/pbvh_parallel.cc
@@ -25,6 +25,9 @@

 #ifdef WITH_TBB

+/* Quiet top level deprecation message, unrelated to API usage here. */
+#  define TBB_SUPPRESS_DEPRECATED_MESSAGES 1
+
 #  include <tbb/tbb.h>

 /* Functor for running TBB parallel_for and parallel_reduce. */