diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2019-07-19 14:39:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-19 14:39:23 +0200 |
commit | 2ca3e47d66fe3f3d849e2084d516949c84011f4b (patch) | |
tree | 626cc7cece53e4664eb63290d6fd043b48dd2640 /editor | |
parent | b79303d39a0ec9eea5fb4c267a8db313b52b57a2 (diff) | |
parent | e425f2d4984f6122ff4a8b20d69b79f89538687b (diff) |
Merge pull request #22642 from YeldhamDev/inspector_metadata
Expose "meta" to the Inspector
Diffstat (limited to 'editor')
-rw-r--r-- | editor/animation_track_editor.cpp | 4 | ||||
-rw-r--r-- | editor/editor_inspector.cpp | 8 | ||||
-rw-r--r-- | editor/editor_inspector.h | 4 | ||||
-rw-r--r-- | editor/inspector_dock.cpp | 2 | ||||
-rw-r--r-- | editor/plugins/tile_set_editor_plugin.cpp | 2 | ||||
-rw-r--r-- | editor/plugins/tile_set_editor_plugin.h | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp index f5b5cfa848..bc7f01eb81 100644 --- a/editor/animation_track_editor.cpp +++ b/editor/animation_track_editor.cpp @@ -46,7 +46,7 @@ class AnimationTrackKeyEdit : public Object { public: bool setting; - bool _hide_script_from_inspector() { + bool _hide_object_properties_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_script_from_inspector", &AnimationTrackKeyEdit::_hide_script_from_inspector); + ClassDB::bind_method("_hide_object_properties_from_inspector", &AnimationTrackKeyEdit::_hide_object_properties_from_inspector); ClassDB::bind_method("get_root_path", &AnimationTrackKeyEdit::get_root_path); ClassDB::bind_method("_dont_undo_redo", &AnimationTrackKeyEdit::_dont_undo_redo); } diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index e4ddf44bc4..0f76aeb818 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -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 (p.name == "script" && (hide_script || bool(object->call("_hide_script_from_inspector")))) { + if ((hide_object_properties || bool(object->call("_hide_object_properties_from_inspector"))) && (p.name == "script" || p.name == "__meta__")) { 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_script(bool p_hide) { - hide_script = p_hide; +void EditorInspector::set_hide_object_properties(bool p_hide) { + hide_object_properties = 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_script = true; + hide_object_properties = true; use_doc_hints = false; capitalize_paths = true; use_filter = false; diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h index 117a63699e..028e1e4111 100644 --- a/editor/editor_inspector.h +++ b/editor/editor_inspector.h @@ -272,7 +272,7 @@ class EditorInspector : public ScrollContainer { LineEdit *search_box; bool show_categories; - bool hide_script; + bool hide_object_properties; 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_script(bool p_hide); + void set_hide_object_properties(bool p_hide); void set_use_filter(bool p_use); void register_text_enter(Node *p_line_edit); diff --git a/editor/inspector_dock.cpp b/editor/inspector_dock.cpp index 8a0812973f..08df780232 100644 --- a/editor/inspector_dock.cpp +++ b/editor/inspector_dock.cpp @@ -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_script(false); + inspector->set_hide_object_properties(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); diff --git a/editor/plugins/tile_set_editor_plugin.cpp b/editor/plugins/tile_set_editor_plugin.cpp index f135becf5f..5e87016171 100644 --- a/editor/plugins/tile_set_editor_plugin.cpp +++ b/editor/plugins/tile_set_editor_plugin.cpp @@ -3369,7 +3369,7 @@ void TilesetEditorContext::_get_property_list(List<PropertyInfo> *p_list) const void TilesetEditorContext::_bind_methods() { - ClassDB::bind_method("_hide_script_from_inspector", &TilesetEditorContext::_hide_script_from_inspector); + ClassDB::bind_method("_hide_object_properties_from_inspector", &TilesetEditorContext::_hide_object_properties_from_inspector); } TilesetEditorContext::TilesetEditorContext(TileSetEditor *p_tileset_editor) { diff --git a/editor/plugins/tile_set_editor_plugin.h b/editor/plugins/tile_set_editor_plugin.h index 69ad8205a4..946c042b02 100644 --- a/editor/plugins/tile_set_editor_plugin.h +++ b/editor/plugins/tile_set_editor_plugin.h @@ -252,7 +252,7 @@ class TilesetEditorContext : public Object { bool snap_options_visible; public: - bool _hide_script_from_inspector() { return true; } + bool _hide_object_properties_from_inspector() { return true; } void set_tileset(const Ref<TileSet> &p_tileset); private: |