diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-05-26 18:20:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-26 18:20:15 +0200 |
| commit | 98dd2b3c7951bb7bab5c0aee4ce28970f6523bad (patch) | |
| tree | aefcdd0d4b22dfc28b3a3846fb553533236c11e9 /drivers/gles3/rasterizer_canvas_gles3.h | |
| parent | 140822cc8fc6383182afbd21ff6239abe644ec14 (diff) | |
| parent | ee52d12921aefd51c74ff9d50833e19569b2fb31 (diff) | |
Merge pull request #18884 from bojidar-bg/17698-screentex-bug
Fix a corner-case bug in _copy_texscreen in the gles3 renderer
Diffstat (limited to 'drivers/gles3/rasterizer_canvas_gles3.h')
| -rw-r--r-- | drivers/gles3/rasterizer_canvas_gles3.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gles3/rasterizer_canvas_gles3.h b/drivers/gles3/rasterizer_canvas_gles3.h index bfaf1fdb4b..c7f2e54efb 100644 --- a/drivers/gles3/rasterizer_canvas_gles3.h +++ b/drivers/gles3/rasterizer_canvas_gles3.h @@ -123,7 +123,7 @@ public: virtual void canvas_end(); _FORCE_INLINE_ void _set_texture_rect_mode(bool p_enable, bool p_ninepatch = false); - _FORCE_INLINE_ RasterizerStorageGLES3::Texture *_bind_canvas_texture(const RID &p_texture, const RID &p_normal_map); + _FORCE_INLINE_ RasterizerStorageGLES3::Texture *_bind_canvas_texture(const RID &p_texture, const RID &p_normal_map, bool p_force = false); _FORCE_INLINE_ void _draw_gui_primitive(int p_points, const Vector2 *p_vertices, const Color *p_colors, const Vector2 *p_uvs); _FORCE_INLINE_ void _draw_polygon(const int *p_indices, int p_index_count, int p_vertex_count, const Vector2 *p_vertices, const Vector2 *p_uvs, const Color *p_colors, bool p_singlecolor, const int *p_bones, const float *p_weights); |