godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Mono: Fix build after ObjectID and Texture2D changes

Browse Source
This commit is contained in:
Rémi Verschelde
2020-02-18 11:02:46 +01:00
parent a16be762ed
commit 702976cd7a
3 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/mono/glue/base_object_glue.cpp
View File

@@ -224,14 +224,9 @@ MonoString *godot_icall_Object_ToString(Object *p_ptr) {
#ifdef DEBUG_ENABLED
// Cannot happen in C#; would get an ObjectDisposedException instead.
CRASH_COND(p_ptr == NULL);
if (ScriptDebugger::get_singleton() && !Object::cast_to<Reference>(p_ptr)) { // Only if debugging!
// Cannot happen either in C#; the handle is nullified when the object is destroyed
CRASH_COND(!ObjectDB::instance_validate(p_ptr));
}
#endif
String result = "[" + p_ptr->get_class() + ":" + itos(p_ptr->get_instance_id()) + "]";
String result = p_ptr->to_string();
return GDMonoMarshal::mono_string_from_godot(result);
}