2
0
Эх сурвалжийг харах

Prevent off-thread errors when generating resource previews for animation nodes

Adam Johnston 8 сар өмнө
parent
commit
c82c5b0701

+ 2 - 1
editor/plugins/animation_tree_editor_plugin.cpp

@@ -234,7 +234,8 @@ bool AnimationTreeEditor::can_edit(const Ref<AnimationNode> &p_node) const {
 }
 }
 
 
 Vector<String> AnimationTreeEditor::get_animation_list() {
 Vector<String> AnimationTreeEditor::get_animation_list() {
-	if (!singleton->tree || !singleton->is_visible()) {
+	// This can be called off the main thread due to resource preview generation. Quit early in that case.
+	if (!singleton->tree || !Thread::is_main_thread() || !singleton->is_visible()) {
 		// When tree is empty, singleton not in the main thread.
 		// When tree is empty, singleton not in the main thread.
 		return Vector<String>();
 		return Vector<String>();
 	}
 	}