diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-06 19:38:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-06 19:38:47 +0100 |
| commit | dfed88b11ff1a3315f1f276ff30cbaaf05e6d7b7 (patch) | |
| tree | 676e5d212972083c56a86d5dc8e4330295adba32 /servers/rendering/rasterizer_rd/rasterizer_storage_rd.cpp | |
| parent | 207f8c08b3f161ea0e84c3f51d4c86662633b5c9 (diff) | |
| parent | 7b8fd6ba9ee70dc7db6d13cece94eb8a98cc0d2d (diff) | |
Merge pull request #43361 from Calinou/fix-rd-uniform-typo
Fix "unifom" typo in RasterizerStorageRD method
Diffstat (limited to 'servers/rendering/rasterizer_rd/rasterizer_storage_rd.cpp')
| -rw-r--r-- | servers/rendering/rasterizer_rd/rasterizer_storage_rd.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/rendering/rasterizer_rd/rasterizer_storage_rd.cpp b/servers/rendering/rasterizer_rd/rasterizer_storage_rd.cpp index 10c9293d67..838f71e6a9 100644 --- a/servers/rendering/rasterizer_rd/rasterizer_storage_rd.cpp +++ b/servers/rendering/rasterizer_rd/rasterizer_storage_rd.cpp @@ -1265,7 +1265,7 @@ void RasterizerStorageRD::canvas_texture_set_texture_repeat(RID p_canvas_texture ct->clear_sets(); } -bool RasterizerStorageRD::canvas_texture_get_unifom_set(RID p_texture, RS::CanvasItemTextureFilter p_base_filter, RS::CanvasItemTextureRepeat p_base_repeat, RID p_base_shader, int p_base_set, RID &r_uniform_set, Size2i &r_size, Color &r_specular_shininess, bool &r_use_normal, bool &r_use_specular) { +bool RasterizerStorageRD::canvas_texture_get_uniform_set(RID p_texture, RS::CanvasItemTextureFilter p_base_filter, RS::CanvasItemTextureRepeat p_base_repeat, RID p_base_shader, int p_base_set, RID &r_uniform_set, Size2i &r_size, Color &r_specular_shininess, bool &r_use_normal, bool &r_use_specular) { CanvasTexture *ct = nullptr; Texture *t = texture_owner.getornull(p_texture); |