1
0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00

Merge pull request #87886 from ryevdokimov/don't-use-physics-process

Do not use `NOTIFICATION_PHYSICS_PROCESS` for 2D Editor
This commit is contained in:
Rémi Verschelde
2024-03-07 10:04:31 +01:00

View File

@@ -3918,7 +3918,7 @@ void CanvasItemEditor::_notification(int p_what) {
EditorRunBar::get_singleton()->connect("stop_pressed", callable_mp(this, &CanvasItemEditor::_update_override_camera_button).bind(false)); EditorRunBar::get_singleton()->connect("stop_pressed", callable_mp(this, &CanvasItemEditor::_update_override_camera_button).bind(false));
} break; } break;
case NOTIFICATION_PHYSICS_PROCESS: { case NOTIFICATION_PROCESS: {
EditorNode::get_singleton()->get_scene_root()->set_snap_controls_to_pixels(GLOBAL_GET("gui/common/snap_controls_to_pixels")); EditorNode::get_singleton()->get_scene_root()->set_snap_controls_to_pixels(GLOBAL_GET("gui/common/snap_controls_to_pixels"));
int nb_having_pivot = 0; int nb_having_pivot = 0;
@@ -5581,13 +5581,13 @@ bool CanvasItemEditorPlugin::handles(Object *p_object) const {
void CanvasItemEditorPlugin::make_visible(bool p_visible) { void CanvasItemEditorPlugin::make_visible(bool p_visible) {
if (p_visible) { if (p_visible) {
canvas_item_editor->show(); canvas_item_editor->show();
canvas_item_editor->set_physics_process(true); canvas_item_editor->set_process(true);
RenderingServer::get_singleton()->viewport_set_disable_2d(EditorNode::get_singleton()->get_scene_root()->get_viewport_rid(), false); RenderingServer::get_singleton()->viewport_set_disable_2d(EditorNode::get_singleton()->get_scene_root()->get_viewport_rid(), false);
RenderingServer::get_singleton()->viewport_set_environment_mode(EditorNode::get_singleton()->get_scene_root()->get_viewport_rid(), RS::VIEWPORT_ENVIRONMENT_ENABLED); RenderingServer::get_singleton()->viewport_set_environment_mode(EditorNode::get_singleton()->get_scene_root()->get_viewport_rid(), RS::VIEWPORT_ENVIRONMENT_ENABLED);
} else { } else {
canvas_item_editor->hide(); canvas_item_editor->hide();
canvas_item_editor->set_physics_process(false); canvas_item_editor->set_process(false);
RenderingServer::get_singleton()->viewport_set_disable_2d(EditorNode::get_singleton()->get_scene_root()->get_viewport_rid(), true); RenderingServer::get_singleton()->viewport_set_disable_2d(EditorNode::get_singleton()->get_scene_root()->get_viewport_rid(), true);
RenderingServer::get_singleton()->viewport_set_environment_mode(EditorNode::get_singleton()->get_scene_root()->get_viewport_rid(), RS::VIEWPORT_ENVIRONMENT_DISABLED); RenderingServer::get_singleton()->viewport_set_environment_mode(EditorNode::get_singleton()->get_scene_root()->get_viewport_rid(), RS::VIEWPORT_ENVIRONMENT_DISABLED);
} }