diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-05-18 09:07:19 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-18 09:07:19 -0300 |
| commit | 5e997c9483e7409e67f3430b667b2982f75b2418 (patch) | |
| tree | 0d08f3dac7835dfc220067d8d44d14a4436ee0ff /drivers | |
| parent | b003b7d846a2aa2369a13f957131fdbc1c1cd398 (diff) | |
| parent | 124774860c9f431eb103258fd9ca4694d1500e8f (diff) | |
Merge pull request #19004 from BastiaanOlij/fix_particles_viewport_texture
Fixes issue that a viewport texture doesn't work with particle shader
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles3/rasterizer_storage_gles3.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index 945df35456..85ae69f8b8 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -5895,7 +5895,10 @@ 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 { target = t->target; |