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

Merge pull request #28641 from Chaosus/fix_vs_collapse

Browse source 
Fixed incorrect collapsing visual shader tree
This commit is contained in:
Yuri Roubinsky 2019-05-03 11:32:13 +03:00 committed by GitHub
parent d962820453 8a8b7af638
commit 184bd3f6e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
editor/plugins/visual_shader_editor_plugin.cpp
View file

@ -58,9 +58,15 @@ void VisualShaderNodePlugin::_bind_methods() {
void VisualShaderEditor::edit(VisualShader *p_visual_shader) {
bool first_init = false;
bool changed = false;
if (p_visual_shader) {
first_init = true;
if (visual_shader.is_null()) {
changed = true;
} else {
if (visual_shader.ptr() != p_visual_shader) {
changed = true;
}
}
visual_shader = Ref<VisualShader>(p_visual_shader);
} else {
visual_shader.unref();
@ -69,7 +75,7 @@ void VisualShaderEditor::edit(VisualShader *p_visual_shader) {
if (visual_shader.is_null()) {
hide();
} else {
if (first_init) { // to avoid tree collapse
if (changed) { // to avoid tree collapse
_update_options_menu();
}
_update_graph();