aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorPoommetee Ketson2018-02-24 15:58:17 +0700
committerHein-Pieter van Braam2018-05-13 22:08:53 +0200
commit2e61ca61938354a305ca4f38b30ac12013ce7d8d (patch)
tree53d1b4ce09917973b33de6d6264e0da7c467c507 /drivers
parent3013f4cf2bacc361058e7900b3e88aa242602142 (diff)
downloadgodot-2e61ca61938354a305ca4f38b30ac12013ce7d8d.tar.gz
godot-2e61ca61938354a305ca4f38b30ac12013ce7d8d.tar.zst
godot-2e61ca61938354a305ca4f38b30ac12013ce7d8d.zip
Particles: fix corrupted scene when saved after convert (2nd try)
(cherry picked from commit 38865345d9d26ae679795e1afdac43a072c1b463)
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gles3/rasterizer_storage_gles3.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp
index a287dca1e..2b8a0230a 100644
--- a/drivers/gles3/rasterizer_storage_gles3.cpp
+++ b/drivers/gles3/rasterizer_storage_gles3.cpp
@@ -1911,7 +1911,7 @@ void RasterizerStorageGLES3::material_set_param(RID p_material, const StringName
Variant RasterizerStorageGLES3::material_get_param(RID p_material, const StringName &p_param) const {
const Material *material = material_owner.get(p_material);
- ERR_FAIL_COND_V(!material, RID());
+ ERR_FAIL_COND_V(!material, Variant());
if (material->params.has(p_param))
return material->params[p_param];