diff options
| author | Bastiaan Olij | 2018-05-19 12:37:26 +1000 |
|---|---|---|
| committer | Bastiaan Olij | 2018-05-19 12:37:26 +1000 |
| commit | f4638d16f132c80a001cb79b30e16348fcaef8f6 (patch) | |
| tree | 33374895810c26bc7e61b20d7bddfb2b86c1b015 /drivers/gles3/rasterizer_storage_gles3.cpp | |
| parent | 228b09bafbad467389dd851699df1a327fbdea21 (diff) | |
| download | godot-f4638d16f132c80a001cb79b30e16348fcaef8f6.tar.gz godot-f4638d16f132c80a001cb79b30e16348fcaef8f6.tar.zst godot-f4638d16f132c80a001cb79b30e16348fcaef8f6.zip | |
Fixed generating radiance texture when using viewport texture for sky
Diffstat (limited to 'drivers/gles3/rasterizer_storage_gles3.cpp')
| -rw-r--r-- | drivers/gles3/rasterizer_storage_gles3.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index 85ae69f8b..11ab95745 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -1356,6 +1356,8 @@ void RasterizerStorageGLES3::sky_set_texture(RID p_sky, RID p_panorama, int p_ra ERR_FAIL_COND(!texture); } + texture = texture->get_ptr(); //resolve for proxies + glBindVertexArray(0); glDisable(GL_CULL_FACE); glDisable(GL_DEPTH_TEST); @@ -5895,12 +5897,9 @@ void RasterizerStorageGLES3::update_particles() { tex = resources.white_tex; } break; } - } else if (t->proxy && t->proxy->tex_id) { - - target = t->proxy->target; - tex = t->proxy->tex_id; } else { + t = t->get_ptr(); //resolve for proxies target = t->target; tex = t->tex_id; } |
