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

Merge remote-tracking branch 'upstream/master' into x11-window-management

Browse Source 
Conflicts:
	platform/x11/detect.py
This commit is contained in:
hurikhan
2015-01-14 13:31:16 +08:00
parent 2203ba5fe3 9012cd408e
commit 8a30feebbe
34 changed files with 1049 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/object_type_db.cpp
View File

@@ -847,8 +847,15 @@ void ObjectTypeDB::set_type_enabled(StringName p_type,bool p_enable) {
bool ObjectTypeDB::is_type_enabled(StringName p_type) {
ERR_FAIL_COND_V(!types.has(p_type),false);
return !types[p_type].disabled;
TypeInfo *ti=types.getptr(p_type);
if (!ti || !ti->creation_func) {
if (compat_types.has(p_type)) {
ti=types.getptr(compat_types[p_type]);
}
}
ERR_FAIL_COND_V(!ti,false);
return !ti->disabled;
}
StringName ObjectTypeDB::get_category(const StringName& p_node) {