Merge branch 'master' into refactor-mesh-position-genericrefactor-mesh-position-generic

1 files changed, 25 insertions, 5 deletions

diff --git a/source/blender/blenlib/intern/lazy_threading.cc b/source/blender/blenlib/intern/lazy_threading.cc
index 803fd81a96d..4f6d3a75ecc 100644
--- a/source/blender/blenlib/intern/lazy_threading.cc
+++ b/source/blender/blenlib/intern/lazy_threading.cc
@@ -1,30 +1,50 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "BLI_lazy_threading.hh"
+#include "BLI_stack.hh"
 #include "BLI_vector.hh"
 
 namespace blender::lazy_threading {
 
 /**
- * This is a #RawVector so that it can be destructed after Blender checks for memory leaks.
+ * This uses a "raw" stack and vector so that it can be destructed after Blender checks for memory
+ * leaks. A new list of receivers is created whenever an isolated region is entered to avoid
+ * deadlocks.
  */
-thread_local RawVector<FunctionRef<void()>, 0> hint_receivers;
+using HintReceivers = RawStack<RawVector<FunctionRef<void()>, 0>, 0>;
+thread_local HintReceivers hint_receivers = []() {
+  HintReceivers receivers;
+  /* Make sure there is always at least one vector. */
+  receivers.push_as();
+  return receivers;
+}();
 
 void send_hint()
 {
-  for (const FunctionRef<void()> &fn : hint_receivers) {
+  for (const FunctionRef<void()> &fn : hint_receivers.peek()) {
     fn();
   }
 }
 
 HintReceiver::HintReceiver(const FunctionRef<void()> fn)
 {
-  hint_receivers.append(fn);
+  hint_receivers.peek().append(fn);
 }
 
 HintReceiver::~HintReceiver()
 {
-  hint_receivers.pop_last();
+  hint_receivers.peek().pop_last();
+}
+
+ReceiverIsolation::ReceiverIsolation()
+{
+  hint_receivers.push_as();
+}
+
+ReceiverIsolation::~ReceiverIsolation()
+{
+  BLI_assert(hint_receivers.peek().is_empty());
+  hint_receivers.pop();
 }
 
 }  // namespace blender::lazy_threading