gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-15 21:29:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #87526 from zaevi/fix_csharp_gc

Browse source 
C#: Fix incorrect GC handle for non-instantiable types.
This commit is contained in:
Rémi Verschelde 2024-01-26 11:47:25 +01:00
parent 73419e645b 201e946741
commit 563e385810
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/mono/editor/bindings_generator.cpp
View file

@ -1621,9 +1621,13 @@ Error BindingsGenerator::_generate_cs_type(const TypeInterface &itype, const Str
<< CLOSE_BLOCK_L2 CLOSE_BLOCK_L1;
} else {
// Hide the constructor
output.append(MEMBER_BEGIN "internal ");
output.append(itype.proxy_name);
output.append("() {}\n");
output << MEMBER_BEGIN "internal " << itype.proxy_name << "() : this("
<< (itype.memory_own ? "true" : "false") << ")\n" OPEN_BLOCK_L1
<< INDENT2 "unsafe\n" INDENT2 OPEN_BLOCK
<< INDENT3 "_ConstructAndInitialize(null, "
<< BINDINGS_NATIVE_NAME_FIELD ", CachedType, refCounted: "
<< (itype.is_ref_counted ? "true" : "false") << ");\n"
<< CLOSE_BLOCK_L2 CLOSE_BLOCK_L1;
}
// Add.. em.. trick constructor. Sort of.

2
modules/mono/glue/GodotSharp/GodotSharp/Core/GodotObject.base.cs
View file

@ -38,6 +38,8 @@ namespace Godot
{
if (NativePtr == IntPtr.Zero)
{
Debug.Assert(nativeCtor != null);
NativePtr = nativeCtor();
InteropUtils.TieManagedToUnmanaged(this, NativePtr,