Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #58105 from trollodel/nuke_p_editor_editor_plugin

Browse source
This commit is contained in:
Rémi Verschelde 2022-02-14 21:10:38 +01:00 • committed by GitHub
commit d02db6306e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/csg/csg_gizmos.cpp
View file

@ -421,7 +421,7 @@ void CSGShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
}
}
EditorPluginCSG::EditorPluginCSG(EditorNode *_p_editor) {
EditorPluginCSG::EditorPluginCSG() {
Ref<CSGShape3DGizmoPlugin> gizmo_plugin = Ref<CSGShape3DGizmoPlugin>(memnew(CSGShape3DGizmoPlugin));
Node3DEditor::get_singleton()->add_gizmo_plugin(gizmo_plugin);
}

2
modules/csg/csg_gizmos.h
View file

@ -57,7 +57,7 @@ class EditorPluginCSG : public EditorPlugin {
GDCLASS(EditorPluginCSG, EditorPlugin);
public:
EditorPluginCSG(EditorNode *_p_editor);
EditorPluginCSG();
};
#endif // CSG_GIZMOS_H

2
modules/gltf/editor_scene_exporter_gltf_plugin.cpp
View file

@ -53,7 +53,7 @@ bool SceneExporterGLTFPlugin::has_main_screen() const {
return false;
}
SceneExporterGLTFPlugin::SceneExporterGLTFPlugin(EditorNode *_p_node) {
SceneExporterGLTFPlugin::SceneExporterGLTFPlugin() {
file_export_lib = memnew(EditorFileDialog);
EditorNode::get_singleton()->get_gui_base()->add_child(file_export_lib);
file_export_lib->connect("file_selected", callable_mp(this, &SceneExporterGLTFPlugin::_gltf2_dialog_action));

2
modules/gltf/editor_scene_exporter_gltf_plugin.h
View file

@ -45,7 +45,7 @@ class SceneExporterGLTFPlugin : public EditorPlugin {
public:
virtual String get_name() const override;
bool has_main_screen() const override;
SceneExporterGLTFPlugin(EditorNode *_p_node);
SceneExporterGLTFPlugin();
};
#endif // TOOLS_ENABLED
#endif // EDITOR_SCENE_EXPORTER_GLTF_PLUGIN_H

2
modules/gridmap/grid_map_editor_plugin.cpp
View file

@ -1489,7 +1489,7 @@ void GridMapEditorPlugin::make_visible(bool p_visible) {
}
}
GridMapEditorPlugin::GridMapEditorPlugin(EditorNode *_p_node) {
GridMapEditorPlugin::GridMapEditorPlugin() {
EDITOR_DEF("editors/grid_map/editor_side", 1);
EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "editors/grid_map/editor_side", PROPERTY_HINT_ENUM, "Left,Right"));

2
modules/gridmap/grid_map_editor_plugin.h
View file

@ -257,7 +257,7 @@ public:
virtual bool handles(Object *p_object) const override;
virtual void make_visible(bool p_visible) override;
GridMapEditorPlugin(EditorNode *_p_node);
GridMapEditorPlugin();
~GridMapEditorPlugin();
};

5
modules/navigation/navigation_mesh_editor_plugin.cpp
View file

@ -140,10 +140,9 @@ void NavigationMeshEditorPlugin::make_visible(bool p_visible) {
}
}
NavigationMeshEditorPlugin::NavigationMeshEditorPlugin(EditorNode *p_node) {
editor = p_node;
NavigationMeshEditorPlugin::NavigationMeshEditorPlugin() {
navigation_mesh_editor = memnew(NavigationMeshEditor);
editor->get_main_control()->add_child(navigation_mesh_editor);
EditorNode::get_singleton()->get_main_control()->add_child(navigation_mesh_editor);
add_control_to_container(CONTAINER_SPATIAL_EDITOR_MENU, navigation_mesh_editor->bake_hbox);
navigation_mesh_editor->hide();
navigation_mesh_editor->bake_hbox->hide();

4
modules/navigation/navigation_mesh_editor_plugin.h
View file

@ -35,7 +35,6 @@
#include "editor/editor_plugin.h"
class EditorNode;
class NavigationRegion3D;
class NavigationMeshEditor : public Control {
@ -70,7 +69,6 @@ class NavigationMeshEditorPlugin : public EditorPlugin {
GDCLASS(NavigationMeshEditorPlugin, EditorPlugin);
NavigationMeshEditor *navigation_mesh_editor;
EditorNode *editor;
public:
virtual String get_name() const override { return "NavigationMesh"; }
@ -79,7 +77,7 @@ public:
virtual bool handles(Object *p_object) const override;
virtual void make_visible(bool p_visible) override;
NavigationMeshEditorPlugin(EditorNode *p_node);
NavigationMeshEditorPlugin();
~NavigationMeshEditorPlugin();
};