Merge 60f92a6432 into dddc713a3a

Fix unhandled PROPERTY_HINT_NO_NODEPATH
Due to upstream change: 6f7525c396
2024-12-18 13:15:25 +00:00 · 2024-12-18 08:15:01 -05:00 · 2024-12-18 08:15:01 -05:00 · 2024-12-18 08:15:01 -05:00 · 2024-12-18 08:15:01 -05:00 · 2024-12-18 08:15:01 -05:00
2 changed files with 4 additions and 2 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_mp(bt.ptr(), &BehaviorTree::get_blackboard_plan));
+	get_blackboard_plan()->set_parent_scope_plan_provider(Callable(bt.ptr(), "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_mp(this, &LimboState::_get_parent_scope_plan));
+		blackboard_plan->set_parent_scope_plan_provider(Callable(this, "_get_parent_scope_plan"));
 	}

 	_update_blackboard_plan();
@ -213,6 +213,8 @@ 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	7d958222c0	Merge `60f92a6432` into `dddc713a3a`	2024-12-18 13:15:25 +00:00
Wilson E. Alvarez	60f92a6432	Fix unhandled PROPERTY_HINT_NO_NODEPATH Due to upstream change: `6f7525c396`	2024-12-18 08:15:01 -05:00
Wilson E. Alvarez	590af23665	Override renamed EditorPlugin::get_name() method Due to upstream change: `0ab3dc273e`	2024-12-18 08:15:01 -05:00
Wilson E. Alvarez	d091461cac	Refactor EditorHelpBit usage Due to upstream change: `4e19ab8afe`	2024-12-18 08:15:01 -05:00
Wilson E. Alvarez	127955b802	Fix unhandled oneshot property hint Due to upstream change: `761a20f7a7`	2024-12-18 08:15:01 -05:00
Wilson E. Alvarez	42d54db286	Fix forbidden comparisons between Ref and nullptr. Necessary when compiling with strict_checks=yes. Due to upstream change: `df29cc696f`	2024-12-18 08:15:01 -05:00
Wilson E. Alvarez	9482a45b76	Fix internal Button set_icon calls to set_button_icon Due to upstream change: `562c666e3d`	2024-12-18 08:13:34 -05:00
Wilson E. Alvarez	4d49a02881	Fix unhandled tool button property hint Due to upstream change: `85dfd89653`	2024-12-18 08:13:34 -05:00
Wilson E. Alvarez	273af02cd8	Fix unhandled dictionary property hint Due to upstream change: `9853a69144`	2024-12-18 08:13:34 -05:00
Wilson E. Alvarez	dd8b72850e	Update EditorMainScreen calls after its extraction Due to upstream change: `5e1c9d68aa`	2024-12-18 08:13:34 -05:00
Serhii Snitsaruk	dddc713a3a	Merge pull request #261 from limbonaut/fix-crash-with-vscode-and-gdextension Fix crash with VSCode and GDExtension	2024-12-17 23:54:21 +01:00
Serhii Snitsaruk	a5118ebc1b	Fix crash while using callable_mp in GDExtension	2024-12-17 00:11:16 +01:00