Merge branch 'master' of https://github.com/olive-editor/olive into winvst

2019-01-09 12:41:53 +11:00
parent f439c5071b 59ae02d8dc
commit f7a420c042
4 changed files with 22 additions and 9 deletions
@@ -4,7 +4,7 @@ uniform sampler2D image;

 uniform vec2 resolution;

-uniform bool shadow;
+uniform int shadow;
 uniform vec3 shadowcolor;
 uniform float shadowsoftness;
 uniform float shadowopacity;
@@ -14,8 +14,7 @@ varying vec2 vTexCoord;

 void main(void) {
 	vec4 master_px = texture2D(image, vTexCoord);
-	if (shadow) {
-
+	if (shadow == 1) {
 		vec2 shadow_dist = vec2(shadowdistance)/resolution;

 		float shadow_opacity = 0.01*shadowopacity;