godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

fix branch on uninit in spatial_editor_plugin

Browse Source 
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.
This commit is contained in:
Ibrahn Sahir
2018-09-20 12:27:32 +01:00
parent a4f5daca67
commit ce15cf8ebc
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
editor/plugins/spatial_editor_plugin.cpp
View File

@@ -4418,6 +4418,8 @@ void SpatialEditor::_menu_item_pressed(int p_option) {
void SpatialEditor::_init_indicators() { void SpatialEditor::_init_indicators() {
{ {
origin_enabled = true;
grid_enabled = true;
indicator_mat.instance(); indicator_mat.instance();
indicator_mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true); 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); 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); 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;
} }
{ {

1
editor/plugins/spatial_editor_plugin.h
View File

@@ -510,7 +510,6 @@ private:
RID grid[3]; RID grid[3];
RID grid_instance[3]; RID grid_instance[3];
bool grid_visible[3]; //currently visible bool grid_visible[3]; //currently visible
float last_grid_snap;
bool grid_enable[3]; //should be always visible if true bool grid_enable[3]; //should be always visible if true
bool grid_enabled; bool grid_enabled;