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

Don't connect ShaderMaterial's changed signal when not in the editor

Browse source 
This closes #34741.
This commit is contained in:
Hugo Locurcio 2020-01-02 17:19:14 +01:00
parent bde52cc688
commit ac3087eb4b
No known key found for this signature in database
GPG key ID: 39E8F8BE30B0A49C
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scene/resources/material.cpp
View file

@ -30,6 +30,8 @@
#include "material.h"
#include "core/engine.h"
#ifdef TOOLS_ENABLED
#include "editor/editor_settings.h"
#endif
@ -191,7 +193,10 @@ Variant ShaderMaterial::property_get_revert(const String &p_name) {
void ShaderMaterial::set_shader(const Ref<Shader> &p_shader) {
if (shader.is_valid()) {
// Only connect/disconnect the signal when running in the editor.
// This can be a slow operation, and `_change_notify()` (which is called by `_shader_changed()`)
// does nothing in non-editor builds anyway. See GH-34741 for details.
if (shader.is_valid() && Engine::get_singleton()->is_editor_hint()) {
shader->disconnect("changed", this, "_shader_changed");
}
@ -200,7 +205,10 @@ void ShaderMaterial::set_shader(const Ref<Shader> &p_shader) {
RID rid;
if (shader.is_valid()) {
rid = shader->get_rid();
shader->connect("changed", this, "_shader_changed");
if (Engine::get_singleton()->is_editor_hint()) {
shader->connect("changed", this, "_shader_changed");
}
}
VS::get_singleton()->material_set_shader(_get_material(), rid);