diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-04-09 00:29:21 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-04-09 00:29:21 -0300 |
| commit | d148a0384821a05f8714099cf00e1b521643a2ad (patch) | |
| tree | b260c213e2c15d8ff4ce9664d784bf0ed39a3935 /drivers | |
| parent | e18c6ef63bb57290b023fde01391f8bdcdfe5aed (diff) | |
-Fixes bug in ShaderGraph material, when uniform property is not used, fixes #1634 and #1610
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles2/rasterizer_gles2.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp index 4f486897d1..3c7026daf1 100644 --- a/drivers/gles2/rasterizer_gles2.cpp +++ b/drivers/gles2/rasterizer_gles2.cpp @@ -1652,6 +1652,9 @@ void RasterizerGLES2::material_set_param(RID p_material, const StringName& p_par } } else { + if (p_value.get_type()==Variant::NIL) + return; + Material::UniformData ud; ud.index=-1; ud.value=p_value; |