nick/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-02-07 11:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Core: Mark property script as internal

Browse Source
This commit is contained in:
Danil Alexeev
2025-11-10 16:17:39 +03:00
parent 7dac0bc3be
commit 6fa2cc77e9
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/object/object.cpp
View File

@@ -616,9 +616,8 @@ void Object::get_property_list(List<PropertyInfo> *p_list, bool p_reversed) cons
_get_property_listv(p_list, p_reversed);
if (!is_class("Script")) { // can still be set, but this is for user-friendliness
p_list->push_back(PropertyInfo(Variant::OBJECT, "script", PROPERTY_HINT_RESOURCE_TYPE, Script::get_class_static(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_NEVER_DUPLICATE));
}
const uint32_t base_script_usage = is_class(Script::get_class_static()) ? PROPERTY_USAGE_NO_EDITOR : PROPERTY_USAGE_DEFAULT;
p_list->push_back(PropertyInfo(Variant::OBJECT, "script", PROPERTY_HINT_RESOURCE_TYPE, Script::get_class_static(), base_script_usage | PROPERTY_USAGE_INTERNAL | PROPERTY_USAGE_NEVER_DUPLICATE));
if (script_instance && !p_reversed) {
script_instance->get_property_list(p_list);
@@ -630,10 +629,10 @@ void Object::get_property_list(List<PropertyInfo> *p_list, bool p_reversed) cons
pi.hint = PROPERTY_HINT_RESOURCE_TYPE;
Object *obj = K.value;
if (Object::cast_to<Script>(obj)) {
pi.hint_string = "Script";
pi.hint_string = Script::get_class_static();
pi.usage |= PROPERTY_USAGE_NEVER_DUPLICATE;
} else {
pi.hint_string = "Resource";
pi.hint_string = Resource::get_class_static();
}
}
p_list->push_back(pi);

2
editor/doc/doc_tools.cpp
View File

@@ -508,7 +508,7 @@ void DocTools::generate(BitField<GenerateFlags> p_flags) {
}
if (properties_from_instance) {
if (E.name == "resource_local_to_scene" || E.name == "resource_name" || E.name == "resource_path" || E.name == "script" || E.name == "resource_scene_unique_id") {
if (E.name == "resource_local_to_scene" || E.name == "resource_name" || E.name == "resource_path" || E.name == "resource_scene_unique_id") {
// Don't include spurious properties from Object property list.
continue;
}