godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-23 15:16:17 +00:00
Code Releases Wiki Activity

GDScript: check for underscore prefix when type-checking

Browse Source 
Some classes are represented internally with an underscore prefix, so we
need to make sure we match this representation when type-checking,
otherwise the check might fail on a valid scenario.
This commit is contained in:
George Marques
2019-01-15 19:50:48 -02:00
parent 4f72c6be8a
commit 31433ae8e4
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gdscript/gdscript_function.h
View File

@@ -74,9 +74,15 @@ struct GDScriptDataType {
return false; return false;
} }
Object *obj = p_variant.operator Object *(); Object *obj = p_variant.operator Object *();
if (obj && !ClassDB::is_parent_class(obj->get_class_name(), native_type)) { if (obj) {
if (!ClassDB::is_parent_class(obj->get_class_name(), native_type)) {
// Try with underscore prefix
StringName underscore_native_type = "_" + native_type;
if (!ClassDB::is_parent_class(obj->get_class_name(), underscore_native_type)) {
return false; return false;
} }
}
}
return true; return true;
} break; } break;
case SCRIPT: case SCRIPT: