From 88b6fee547a40617da80ea6ca36fd2df87160ab3 Mon Sep 17 00:00:00 2001 From: David Snopek Date: Mon, 9 Oct 2023 10:59:45 -0500 Subject: [PATCH] GDExtension: Use correct return pointer for validated calls that return `Variant` --- core/extension/gdextension.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/extension/gdextension.cpp b/core/extension/gdextension.cpp index 2a287a1816f..dedb0876452 100644 --- a/core/extension/gdextension.cpp +++ b/core/extension/gdextension.cpp @@ -234,7 +234,7 @@ public: void *ret_opaque = nullptr; if (r_ret) { VariantInternal::initialize(r_ret, return_value_info.type); - ret_opaque = VariantInternal::get_opaque_pointer(r_ret); + ret_opaque = r_ret->get_type() == Variant::NIL ? r_ret : VariantInternal::get_opaque_pointer(r_ret); } ptrcall(p_object, argptrs, ret_opaque);