From ce15cf8ebc976c63cd19e0024102f67677c8c1ff Mon Sep 17 00:00:00 2001 From: Ibrahn Sahir Date: Thu, 20 Sep 2018 12:27:32 +0100 Subject: [PATCH] fix branch on uninit in spatial_editor_plugin Moved the initialisation of origin_enabled up a bit, to be inited before it's accessed in _init_grid. A step towards cleaner valgrind output and removes an opportunity for a random occurance of the origin/grid z-fighting issue. Also removed unused variable last_grid_snap to avoid later confusion. --- editor/plugins/spatial_editor_plugin.cpp | 6 ++---- editor/plugins/spatial_editor_plugin.h | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index 6df026843a..fed4362405 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -4418,6 +4418,8 @@ void SpatialEditor::_menu_item_pressed(int p_option) { void SpatialEditor::_init_indicators() { { + origin_enabled = true; + grid_enabled = true; indicator_mat.instance(); indicator_mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true); @@ -4458,10 +4460,6 @@ void SpatialEditor::_init_indicators() { VS::get_singleton()->instance_set_layer_mask(origin_instance, 1 << SpatialEditorViewport::GIZMO_GRID_LAYER); VisualServer::get_singleton()->instance_geometry_set_cast_shadows_setting(origin_instance, VS::SHADOW_CASTING_SETTING_OFF); - - origin_enabled = true; - grid_enabled = true; - last_grid_snap = 1; } { diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h index 0e35ba8517..b7317cd593 100644 --- a/editor/plugins/spatial_editor_plugin.h +++ b/editor/plugins/spatial_editor_plugin.h @@ -510,7 +510,6 @@ private: RID grid[3]; RID grid_instance[3]; bool grid_visible[3]; //currently visible - float last_grid_snap; bool grid_enable[3]; //should be always visible if true bool grid_enabled;