diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-12-05 13:19:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-05 13:19:30 +0100 |
| commit | 744ab88884cc0794c47be2393b5cc3490989af00 (patch) | |
| tree | 2d6fd1b3c94b28cf6dbb33cff3263a05e8a34610 /servers/rendering/renderer_rd/renderer_compositor_rd.cpp | |
| parent | eed484d054d56ead9954158683105d200700e6fb (diff) | |
| parent | 5ef62e546f485e5f2798230dcfbea2b4ddecbe6e (diff) | |
Merge pull request #36382 from aaronfranke/unhide-the-hidden
Unhide hidden members by renaming them and rebind Mesh enums
Diffstat (limited to 'servers/rendering/renderer_rd/renderer_compositor_rd.cpp')
| -rw-r--r-- | servers/rendering/renderer_rd/renderer_compositor_rd.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/rendering/renderer_rd/renderer_compositor_rd.cpp b/servers/rendering/renderer_rd/renderer_compositor_rd.cpp index 433396d0ff..4ae7e68219 100644 --- a/servers/rendering/renderer_rd/renderer_compositor_rd.cpp +++ b/servers/rendering/renderer_rd/renderer_compositor_rd.cpp @@ -47,7 +47,7 @@ void RendererCompositorRD::blit_render_targets_to_screen(DisplayServer::WindowID if (!render_target_descriptors.has(rd_texture) || !RD::get_singleton()->uniform_set_is_valid(render_target_descriptors[rd_texture])) { Vector<RD::Uniform> uniforms; RD::Uniform u; - u.type = RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE; + u.uniform_type = RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE; u.binding = 0; u.ids.push_back(copy_viewports_sampler); u.ids.push_back(rd_texture); |