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

Merge pull request #22568 from dlasalle/#14959 

Explicitly show viewport 0 in the SpatialEditorPlugin if the container is large enough.
This commit is contained in:
Rémi Verschelde 2018-10-02 11:26:29 +02:00 committed by GitHub
parent dd3f6a04db df06087057
commit 106acb27f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
editor/plugins/spatial_editor_plugin.cpp
View File

@ -3764,6 +3764,7 @@ void SpatialEditorViewportContainer::_notification(int p_what) {
case VIEW_USE_1_VIEWPORT: { case VIEW_USE_1_VIEWPORT: {
viewports[0]->show();
for (int i = 1; i < 4; i++) { for (int i = 1; i < 4; i++) {
viewports[i]->hide(); viewports[i]->hide();
@ -3774,7 +3775,7 @@ void SpatialEditorViewportContainer::_notification(int p_what) {
} break; } break;
case VIEW_USE_2_VIEWPORTS: { case VIEW_USE_2_VIEWPORTS: {
for (int i = 1; i < 4; i++) { for (int i = 0; i < 4; i++) {
if (i == 1 || i == 3) if (i == 1 || i == 3)
viewports[i]->hide(); viewports[i]->hide();
@ -3788,7 +3789,7 @@ void SpatialEditorViewportContainer::_notification(int p_what) {
} break; } break;
case VIEW_USE_2_VIEWPORTS_ALT: { case VIEW_USE_2_VIEWPORTS_ALT: {
for (int i = 1; i < 4; i++) { for (int i = 0; i < 4; i++) {
if (i == 1 || i == 3) if (i == 1 || i == 3)
viewports[i]->hide(); viewports[i]->hide();
@ -3801,7 +3802,7 @@ void SpatialEditorViewportContainer::_notification(int p_what) {
} break; } break;
case VIEW_USE_3_VIEWPORTS: { case VIEW_USE_3_VIEWPORTS: {
for (int i = 1; i < 4; i++) { for (int i = 0; i < 4; i++) {
if (i == 1) if (i == 1)
viewports[i]->hide(); viewports[i]->hide();
@ -3816,7 +3817,7 @@ void SpatialEditorViewportContainer::_notification(int p_what) {
} break; } break;
case VIEW_USE_3_VIEWPORTS_ALT: { case VIEW_USE_3_VIEWPORTS_ALT: {
for (int i = 1; i < 4; i++) { for (int i = 0; i < 4; i++) {
if (i == 1) if (i == 1)
viewports[i]->hide(); viewports[i]->hide();
@ -3831,7 +3832,7 @@ void SpatialEditorViewportContainer::_notification(int p_what) {
} break; } break;
case VIEW_USE_4_VIEWPORTS: { case VIEW_USE_4_VIEWPORTS: {
for (int i = 1; i < 4; i++) { for (int i = 0; i < 4; i++) {
viewports[i]->show(); viewports[i]->show();
} }