Merge pull request #30749 from godotengine/revert-22642-inspector_metadata
Revert "Expose "meta" to the Inspector"
This commit is contained in:
commit
7b7c459106
|
@ -635,12 +635,9 @@ void Object::get_property_list(List<PropertyInfo> *p_list, bool p_reversed) cons
|
|||
#endif
|
||||
p_list->push_back(PropertyInfo(Variant::OBJECT, "script", PROPERTY_HINT_RESOURCE_TYPE, "Script", PROPERTY_USAGE_DEFAULT));
|
||||
}
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
p_list->push_back(PropertyInfo(Variant::NIL, "Metadata", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_GROUP));
|
||||
#endif
|
||||
p_list->push_back(PropertyInfo(Variant::DICTIONARY, "__meta__", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT));
|
||||
|
||||
if (!metadata.empty()) {
|
||||
p_list->push_back(PropertyInfo(Variant::DICTIONARY, "__meta__", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
|
||||
}
|
||||
if (script_instance && !p_reversed) {
|
||||
p_list->push_back(PropertyInfo(Variant::NIL, "Script Variables", PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_CATEGORY));
|
||||
script_instance->get_property_list(p_list);
|
||||
|
|
|
@ -46,7 +46,7 @@ class AnimationTrackKeyEdit : public Object {
|
|||
public:
|
||||
bool setting;
|
||||
|
||||
bool _hide_object_properties_from_inspector() {
|
||||
bool _hide_script_from_inspector() {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -58,7 +58,7 @@ public:
|
|||
|
||||
ClassDB::bind_method("_update_obj", &AnimationTrackKeyEdit::_update_obj);
|
||||
ClassDB::bind_method("_key_ofs_changed", &AnimationTrackKeyEdit::_key_ofs_changed);
|
||||
ClassDB::bind_method("_hide_object_properties_from_inspector", &AnimationTrackKeyEdit::_hide_object_properties_from_inspector);
|
||||
ClassDB::bind_method("_hide_script_from_inspector", &AnimationTrackKeyEdit::_hide_script_from_inspector);
|
||||
ClassDB::bind_method("get_root_path", &AnimationTrackKeyEdit::get_root_path);
|
||||
ClassDB::bind_method("_dont_undo_redo", &AnimationTrackKeyEdit::_dont_undo_redo);
|
||||
}
|
||||
|
|
|
@ -1550,7 +1550,7 @@ void EditorInspector::update_tree() {
|
|||
if (p.usage & PROPERTY_USAGE_HIGH_END_GFX && VS::get_singleton()->is_low_end())
|
||||
continue; //do not show this property in low end gfx
|
||||
|
||||
if ((hide_object_properties || bool(object->call("_hide_object_properties_from_inspector"))) && (p.name == "script" || p.name == "__meta__")) {
|
||||
if (p.name == "script" && (hide_script || bool(object->call("_hide_script_from_inspector")))) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
@ -1877,8 +1877,8 @@ void EditorInspector::set_use_doc_hints(bool p_enable) {
|
|||
use_doc_hints = p_enable;
|
||||
update_tree();
|
||||
}
|
||||
void EditorInspector::set_hide_object_properties(bool p_hide) {
|
||||
hide_object_properties = p_hide;
|
||||
void EditorInspector::set_hide_script(bool p_hide) {
|
||||
hide_script = p_hide;
|
||||
update_tree();
|
||||
}
|
||||
void EditorInspector::set_use_filter(bool p_use) {
|
||||
|
@ -2318,7 +2318,7 @@ EditorInspector::EditorInspector() {
|
|||
set_enable_v_scroll(true);
|
||||
|
||||
show_categories = false;
|
||||
hide_object_properties = true;
|
||||
hide_script = true;
|
||||
use_doc_hints = false;
|
||||
capitalize_paths = true;
|
||||
use_filter = false;
|
||||
|
|
|
@ -272,7 +272,7 @@ class EditorInspector : public ScrollContainer {
|
|||
|
||||
LineEdit *search_box;
|
||||
bool show_categories;
|
||||
bool hide_object_properties;
|
||||
bool hide_script;
|
||||
bool use_doc_hints;
|
||||
bool capitalize_paths;
|
||||
bool use_filter;
|
||||
|
@ -360,7 +360,7 @@ public:
|
|||
|
||||
void set_show_categories(bool p_show);
|
||||
void set_use_doc_hints(bool p_enable);
|
||||
void set_hide_object_properties(bool p_hide);
|
||||
void set_hide_script(bool p_hide);
|
||||
|
||||
void set_use_filter(bool p_use);
|
||||
void register_text_enter(Node *p_line_edit);
|
||||
|
|
|
@ -597,7 +597,7 @@ InspectorDock::InspectorDock(EditorNode *p_editor, EditorData &p_editor_data) {
|
|||
inspector->set_show_categories(true);
|
||||
inspector->set_v_size_flags(Control::SIZE_EXPAND_FILL);
|
||||
inspector->set_use_doc_hints(true);
|
||||
inspector->set_hide_object_properties(false);
|
||||
inspector->set_hide_script(false);
|
||||
inspector->set_enable_capitalize_paths(bool(EDITOR_GET("interface/inspector/capitalize_properties")));
|
||||
inspector->set_use_folding(!bool(EDITOR_GET("interface/inspector/disable_folding")));
|
||||
inspector->register_text_enter(search);
|
||||
|
|
|
@ -3369,7 +3369,7 @@ void TilesetEditorContext::_get_property_list(List<PropertyInfo> *p_list) const
|
|||
|
||||
void TilesetEditorContext::_bind_methods() {
|
||||
|
||||
ClassDB::bind_method("_hide_object_properties_from_inspector", &TilesetEditorContext::_hide_object_properties_from_inspector);
|
||||
ClassDB::bind_method("_hide_script_from_inspector", &TilesetEditorContext::_hide_script_from_inspector);
|
||||
}
|
||||
|
||||
TilesetEditorContext::TilesetEditorContext(TileSetEditor *p_tileset_editor) {
|
||||
|
|
|
@ -252,7 +252,7 @@ class TilesetEditorContext : public Object {
|
|||
bool snap_options_visible;
|
||||
|
||||
public:
|
||||
bool _hide_object_properties_from_inspector() { return true; }
|
||||
bool _hide_script_from_inspector() { return true; }
|
||||
void set_tileset(const Ref<TileSet> &p_tileset);
|
||||
|
||||
private:
|
||||
|
|
Loading…
Reference in New Issue