diff options
| author | Juan Linietsky | 2015-12-12 17:36:52 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-12-12 17:36:52 -0300 |
| commit | 97fe073f33e7efa417e424e6f146435596ee9864 (patch) | |
| tree | ca0942a0c2eab379950cfa2db2d14203eb6d67f7 /scene/resources/material.cpp | |
| parent | 6316f8941c5371ecb861041c23c2ae04abf236d5 (diff) | |
| parent | 1138103c6374bee84680bfe85ff794191365e33a (diff) | |
| download | godot-97fe073f33e7efa417e424e6f146435596ee9864.tar.gz godot-97fe073f33e7efa417e424e6f146435596ee9864.tar.zst godot-97fe073f33e7efa417e424e6f146435596ee9864.zip | |
Merge pull request #2933 from TheHX/pr-shader-loader
Fix shader loading, making possible load .shd and .sgp from editor
Diffstat (limited to 'scene/resources/material.cpp')
| -rw-r--r-- | scene/resources/material.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index 55bb4e907..b4ea60cb8 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -535,6 +535,8 @@ void ShaderMaterial::_shader_changed() { void ShaderMaterial::set_shader(const Ref<Shader>& p_shader) { + ERR_FAIL_COND(p_shader.is_valid() && p_shader->get_mode()!=Shader::MODE_MATERIAL); + if (shader.is_valid()) shader->disconnect(SceneStringNames::get_singleton()->changed,this,SceneStringNames::get_singleton()->_shader_changed); shader=p_shader; |