asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #68558 from dzil123/remove_duplicate_wireframe

Browse source 
Node3DEditorViewport - Remove duplicate wireframe check and cleanup
This commit is contained in:
Rémi Verschelde 2023-02-14 13:36:52 +01:00
commit 56d78c32f7
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
editor/plugins/node_3d_editor_plugin.cpp
View file

@ -3392,7 +3392,6 @@ void Node3DEditorViewport::_menu_option(int p_option) {
VIEW_DISPLAY_SHADELESS, VIEW_DISPLAY_SHADELESS,
VIEW_DISPLAY_LIGHTING, VIEW_DISPLAY_LIGHTING,
VIEW_DISPLAY_NORMAL_BUFFER, VIEW_DISPLAY_NORMAL_BUFFER,
VIEW_DISPLAY_WIREFRAME,
VIEW_DISPLAY_DEBUG_SHADOW_ATLAS, VIEW_DISPLAY_DEBUG_SHADOW_ATLAS,
VIEW_DISPLAY_DEBUG_DIRECTIONAL_SHADOW_ATLAS, VIEW_DISPLAY_DEBUG_DIRECTIONAL_SHADOW_ATLAS,
VIEW_DISPLAY_DEBUG_VOXEL_GI_ALBEDO, VIEW_DISPLAY_DEBUG_VOXEL_GI_ALBEDO,
@ -3422,7 +3421,6 @@ void Node3DEditorViewport::_menu_option(int p_option) {
Viewport::DEBUG_DRAW_UNSHADED, Viewport::DEBUG_DRAW_UNSHADED,
Viewport::DEBUG_DRAW_LIGHTING, Viewport::DEBUG_DRAW_LIGHTING,
Viewport::DEBUG_DRAW_NORMAL_BUFFER, Viewport::DEBUG_DRAW_NORMAL_BUFFER,
Viewport::DEBUG_DRAW_WIREFRAME,
Viewport::DEBUG_DRAW_SHADOW_ATLAS, Viewport::DEBUG_DRAW_SHADOW_ATLAS,
Viewport::DEBUG_DRAW_DIRECTIONAL_SHADOW_ATLAS, Viewport::DEBUG_DRAW_DIRECTIONAL_SHADOW_ATLAS,
Viewport::DEBUG_DRAW_VOXEL_GI_ALBEDO, Viewport::DEBUG_DRAW_VOXEL_GI_ALBEDO,
@ -3445,9 +3443,7 @@ void Node3DEditorViewport::_menu_option(int p_option) {
Viewport::DEBUG_DRAW_MOTION_VECTORS, Viewport::DEBUG_DRAW_MOTION_VECTORS,
}; };
int idx = 0; for (int idx = 0; display_options[idx] != VIEW_MAX; idx++) {
while (display_options[idx] != VIEW_MAX) {
int id = display_options[idx]; int id = display_options[idx];
int item_idx = view_menu->get_popup()->get_item_index(id); int item_idx = view_menu->get_popup()->get_item_index(id);
if (item_idx != -1) { if (item_idx != -1) {
@ -3461,7 +3457,6 @@ void Node3DEditorViewport::_menu_option(int p_option) {
if (id == p_option) { if (id == p_option) {
viewport->set_debug_draw(debug_draw_modes[idx]); viewport->set_debug_draw(debug_draw_modes[idx]);
} }
idx++;
} }
} break; } break;
} }