diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-08-27 22:01:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-27 22:01:20 +0200 |
| commit | 1b01246731f3733b90e18d1d0ff95120e1f52781 (patch) | |
| tree | 1a2f46c7755db9e1c70a8cf8836665ae3dee18fe /tools/editor/plugins | |
| parent | b6e206e9955af345c3bfc90b53fa3940fe047774 (diff) | |
| parent | a4c3d2dc89b3078acc14af1cfd8a947490d21a3f (diff) | |
Merge pull request #6186 from TheHX/pr-issue-5878
Fix editor glitches when the mesh/material preview is shown
Diffstat (limited to 'tools/editor/plugins')
| -rw-r--r-- | tools/editor/plugins/material_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | tools/editor/plugins/mesh_editor_plugin.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/editor/plugins/material_editor_plugin.cpp b/tools/editor/plugins/material_editor_plugin.cpp index f4258836e5..876fab0d6e 100644 --- a/tools/editor/plugins/material_editor_plugin.cpp +++ b/tools/editor/plugins/material_editor_plugin.cpp @@ -103,7 +103,7 @@ MaterialEditor::MaterialEditor() { world.instance(); viewport->set_world(world); //use own world add_child(viewport); - viewport->set_process_input(false); + viewport->set_disable_input(true); camera = memnew( Camera ); camera->set_transform(Transform(Matrix3(),Vector3(0,0,3))); diff --git a/tools/editor/plugins/mesh_editor_plugin.cpp b/tools/editor/plugins/mesh_editor_plugin.cpp index 71cf33ba1b..b70cbad25f 100644 --- a/tools/editor/plugins/mesh_editor_plugin.cpp +++ b/tools/editor/plugins/mesh_editor_plugin.cpp @@ -147,7 +147,7 @@ MeshEditor::MeshEditor() { world.instance(); viewport->set_world(world); //use own world add_child(viewport); - viewport->set_process_input(false); + viewport->set_disable_input(true); camera = memnew( Camera ); camera->set_transform(Transform(Matrix3(),Vector3(0,0,3))); |