diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-05-03 21:24:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-03 21:24:03 +0200 |
| commit | 430e45c84a9db6506dd62a3ad6e4567a319b2feb (patch) | |
| tree | 7b1d430d1851821405e51555bb6180771e1f6781 /drivers | |
| parent | 460e551ddf38626d3db01dd6bac3caa5b328cf9f (diff) | |
| parent | 38865345d9d26ae679795e1afdac43a072c1b463 (diff) | |
Merge pull request #16359 from Noshyaar/convert
Particles: fix corrupted scene when saved after convert
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles3/rasterizer_storage_gles3.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index f91ed35331..29f6aa5291 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -1912,7 +1912,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]; |