Merge a67f38b862 into 6fecc1e4b5

Fix unhandled PROPERTY_HINT_NO_NODEPATH
Due to upstream change: 6f7525c396
2024-12-17 22:42:08 +00:00 · 2024-12-17 17:41:35 -05:00 · 2024-12-17 17:37:47 -05:00 · 2024-12-17 17:34:57 -05:00 · 2024-12-16 23:13:51 -05:00 · 2024-12-16 23:13:51 -05:00
2 changed files with 2 additions and 4 deletions
--- a/bt/tasks/decorators/bt_new_scope.cpp
+++ b/bt/tasks/decorators/bt_new_scope.cpp
@ -35,7 +35,7 @@ void BTNewScope::_set_parent_scope_plan_from_bt() {
 	ERR_FAIL_COND(get_blackboard_plan().is_null());
 	Ref<BehaviorTree> bt = get_root()->editor_get_behavior_tree();
 	ERR_FAIL_COND(bt.is_null());
-	get_blackboard_plan()->set_parent_scope_plan_provider(Callable(bt.ptr(), "get_blackboard_plan"));
+	get_blackboard_plan()->set_parent_scope_plan_provider(callable_mp(bt.ptr(), &BehaviorTree::get_blackboard_plan));
 }
 #endif // TOOLS_ENABLED

--- a/hsm/limbo_state.cpp
+++ b/hsm/limbo_state.cpp
@ -24,7 +24,7 @@ void LimboState::set_blackboard_plan(const Ref<BlackboardPlan> &p_plan) {
 	blackboard_plan = p_plan;

 	if (Engine::get_singleton()->is_editor_hint() && blackboard_plan.is_valid()) {
-		blackboard_plan->set_parent_scope_plan_provider(Callable(this, "_get_parent_scope_plan"));
+		blackboard_plan->set_parent_scope_plan_provider(callable_mp(this, &LimboState::_get_parent_scope_plan));
 	}

 	_update_blackboard_plan();
@ -213,8 +213,6 @@ void LimboState::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_blackboard_plan", "plan"), &LimboState::set_blackboard_plan);
 	ClassDB::bind_method(D_METHOD("get_blackboard_plan"), &LimboState::get_blackboard_plan);

-	ClassDB::bind_method(D_METHOD("_get_parent_scope_plan"), &LimboState::_get_parent_scope_plan);
-
 	GDVIRTUAL_BIND(_setup);
 	GDVIRTUAL_BIND(_enter);
 	GDVIRTUAL_BIND(_exit);
Author	SHA1	Message	Date
Wilson E. Alvarez	493761c5db	Merge `a67f38b862` into `6fecc1e4b5`	2024-12-17 22:42:08 +00:00
Wilson E. Alvarez	a67f38b862	Fix unhandled PROPERTY_HINT_NO_NODEPATH Due to upstream change: `6f7525c396`	2024-12-17 17:41:35 -05:00
Wilson E. Alvarez	765f863504	Override renamed EditorPlugin::get_name() method Due to upstream change: `0ab3dc273e`	2024-12-17 17:37:47 -05:00
Wilson E. Alvarez	27a6b2021b	Refactor EditorHelpBit usage Due to upstream change: `4e19ab8afe`	2024-12-17 17:34:57 -05:00
Wilson E. Alvarez	834f194b6c	Fix unhandled oneshot property hint Due to upstream change: `761a20f7a7`	2024-12-16 23:13:51 -05:00
Wilson E. Alvarez	9653ffcb9a	Fix forbidden comparisons between Ref and nullptr. Necessary when compiling with strict_checks=yes. Due to upstream change: `df29cc696f`	2024-12-16 23:13:51 -05:00
Wilson E. Alvarez	21a944e23f	Fix internal Button set_icon calls to set_button_icon Due to upstream change: `562c666e3d`	2024-12-16 23:13:51 -05:00
Wilson E. Alvarez	75582896bb	Fix unhandled tool button property hint Due to upstream change: `85dfd89653`	2024-12-16 23:13:51 -05:00
Wilson E. Alvarez	a4b4165725	Fix unhandled dictionary property hint Due to upstream change: `9853a69144`	2024-12-16 23:13:51 -05:00
Wilson E. Alvarez	9a14f52869	Update EditorMainScreen calls after its extraction Due to upstream change: `5e1c9d68aa`	2024-12-16 23:13:51 -05:00