summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-01-01 14:09:12 +0100
committerGitHub <noreply@github.com>2020-01-01 14:09:12 +0100
commit85fa17d3c29156011109f6ac375bedd9c69a5115 (patch)
tree37b1747b7f139e803829edc87568330d34fe762c
parentf7715b58bded9d0402ddff3c7fb389344ee3591c (diff)
parentbb6f04c9f53f4318c3bd44b3e7398f6973f7b68d (diff)
downloadredot-engine-85fa17d3c29156011109f6ac375bedd9c69a5115.tar.gz
Merge pull request #34729 from TritiatedWater/patch-1
Fix wrong return type in canvas.glsl
-rw-r--r--drivers/gles3/shaders/canvas.glsl2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gles3/shaders/canvas.glsl b/drivers/gles3/shaders/canvas.glsl
index cd1c669be5..ec18c83df3 100644
--- a/drivers/gles3/shaders/canvas.glsl
+++ b/drivers/gles3/shaders/canvas.glsl
@@ -419,7 +419,7 @@ float map_ninepatch_axis(float pixel, float draw_size, float tex_pixel_size, flo
// Scale to source texture.
return (margin_begin + ratio * dst_area) * tex_pixel_size;
} else { // Shouldn't happen, but silences compiler warning.
- return 0;
+ return 0.0;
}
}
}