maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #22282 from ibrahn/spatial_editor_origin_init

Browse source 
fix branch on uninit in spatial_editor_plugin
This commit is contained in:
Rémi Verschelde 2018-09-20 15:50:41 +02:00 committed by GitHub
parent 88ebd710f9 ce15cf8ebc
commit 9136f1287e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Show stats 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() {
{
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;
}
{

1
editor/plugins/spatial_editor_plugin.h
View file

@ -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;