godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add EditorInspector getter. Update Sub-Inspectors. 

(cherry picked from commit c1b247e4d5)
This commit is contained in:
Will Nations 2019-03-12 01:43:48 -05:00 committed by Rémi Verschelde
parent 0f51f138b5
commit 0e7de28b8d
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/editor_plugin.cpp
View File

@ -240,6 +240,10 @@ bool EditorInterface::is_plugin_enabled(const String &p_plugin) const {
return EditorNode::get_singleton()->is_addon_plugin_enabled(p_plugin); return EditorNode::get_singleton()->is_addon_plugin_enabled(p_plugin);
} }
EditorInspector *EditorInterface::get_inspector() const {
return EditorNode::get_singleton()->get_inspector();
}
Error EditorInterface::save_scene() { Error EditorInterface::save_scene() {
if (!get_edited_scene_root()) if (!get_edited_scene_root())
return ERR_CANT_CREATE; return ERR_CANT_CREATE;
@ -279,6 +283,8 @@ void EditorInterface::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_plugin_enabled", "plugin", "enabled"), &EditorInterface::set_plugin_enabled); ClassDB::bind_method(D_METHOD("set_plugin_enabled", "plugin", "enabled"), &EditorInterface::set_plugin_enabled);
ClassDB::bind_method(D_METHOD("is_plugin_enabled", "plugin"), &EditorInterface::is_plugin_enabled); ClassDB::bind_method(D_METHOD("is_plugin_enabled", "plugin"), &EditorInterface::is_plugin_enabled);
ClassDB::bind_method(D_METHOD("get_inspector"), &EditorInterface::get_inspector);
ClassDB::bind_method(D_METHOD("save_scene"), &EditorInterface::save_scene); ClassDB::bind_method(D_METHOD("save_scene"), &EditorInterface::save_scene);
ClassDB::bind_method(D_METHOD("save_scene_as", "path", "with_preview"), &EditorInterface::save_scene_as, DEFVAL(true)); ClassDB::bind_method(D_METHOD("save_scene_as", "path", "with_preview"), &EditorInterface::save_scene_as, DEFVAL(true));
} }

2
editor/editor_plugin.h
View File

@ -95,6 +95,8 @@ public:
void set_plugin_enabled(const String &p_plugin, bool p_enabled); void set_plugin_enabled(const String &p_plugin, bool p_enabled);
bool is_plugin_enabled(const String &p_plugin) const; bool is_plugin_enabled(const String &p_plugin) const;
EditorInspector *get_inspector() const;
Error save_scene(); Error save_scene();
void save_scene_as(const String &p_scene, bool p_with_preview = true); void save_scene_as(const String &p_scene, bool p_with_preview = true);

1
editor/editor_properties.cpp
View File

@ -2542,6 +2542,7 @@ void EditorPropertyResource::update_property() {
sub_inspector->edit(res.ptr()); sub_inspector->edit(res.ptr());
} }
sub_inspector->refresh();
} else { } else {
if (sub_inspector) { if (sub_inspector) {
set_bottom_editor(NULL); set_bottom_editor(NULL);