hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #50040 from reduz/fix-renderingserver-bindings

Browse source 
Clean up RenderingServer and its bindings
This commit is contained in:
Rémi Verschelde 2021-07-01 15:17:33 +02:00 • committed by GitHub
commit ad8a2b3d52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 3020 additions and 900 deletions
Download patch file Download diff file Expand all files Collapse all files

4
editor/plugins/canvas_item_editor_plugin.cpp
View file

@ -5631,12 +5631,12 @@ void CanvasItemEditorPlugin::make_visible(bool p_visible) {
if (p_visible) {
canvas_item_editor->show();
canvas_item_editor->set_physics_process(true);
RenderingServer::get_singleton()->viewport_set_hide_canvas(editor->get_scene_root()->get_viewport_rid(), false);
RenderingServer::get_singleton()->viewport_set_disable_2d(editor->get_scene_root()->get_viewport_rid(), false);
} else {
canvas_item_editor->hide();
canvas_item_editor->set_physics_process(false);
RenderingServer::get_singleton()->viewport_set_hide_canvas(editor->get_scene_root()->get_viewport_rid(), true);
RenderingServer::get_singleton()->viewport_set_disable_2d(editor->get_scene_root()->get_viewport_rid(), true);
}
}

2
editor/plugins/node_3d_editor_plugin.cpp
View file

@ -7081,8 +7081,6 @@ Node3DEditor::Node3DEditor(EditorNode *p_editor) {
xform_dialog->connect("confirmed", callable_mp(this, &Node3DEditor::_xform_dialog_action));
scenario_debug = RenderingServer::SCENARIO_DEBUG_DISABLED;
selected = nullptr;
set_process_unhandled_key_input(true);

2
editor/plugins/node_3d_editor_plugin.h
View file

@ -600,8 +600,6 @@ private:
ToolMode tool_mode;
RenderingServer::ScenarioDebugMode scenario_debug;
RID origin;
RID origin_instance;
bool origin_enabled;