Merge pull request #83054 from dsnopek/gdextension-validated-call-alw…

…ays-ret-pointer GDExtension: Use correct return pointer for validated calls that return `Variant`
godotengine · Oct 10, 2023 · feb6ea2 · feb6ea2
2 parents 49cdd33 + 88b6fee
commit feb6ea2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/extension/gdextension.cpp b/core/extension/gdextension.cpp
@@ -234,7 +234,7 @@ class GDExtensionMethodBind : public MethodBind {
 			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);