Merge branch 'master' of git://github.com/olive-editor/olive

2019-03-28 19:09:43 +06:00
parent b950d0f5ea a6f3b4a5da
commit 197e649821
12 changed files with 1068 additions and 930 deletions
@@ -805,7 +805,9 @@ void Effect::startEffect() {
 }

 void Effect::endEffect() {
-  if (bound) glslProgram->release();
+  if (bound) {
+    glslProgram->release();
+  }
  bound = false;
 }

@@ -4,7 +4,7 @@

 uniform sampler2D image;

-// uniform float radius;
+//uniform float radius;
 uniform float sigma;
 uniform vec2 resolution;
 uniform bool horiz_blur;
@@ -22,13 +22,13 @@ float gaussian2(float x, float y, float sigma) {
 }

 void main(void) {
-	float rad = ceil(sigma);
+	float rad = ceil(3.0 * sigma);

 	float sum = 0.0;

 	vec4 color = vec4(0.0);

-	bool radius_is_zero = (rad == 0.0);
+	bool radius_is_zero = (rad == 0.0 || sigma == 0.0);

 	if (!radius_is_zero) {
 		for (float x=-rad+0.5;x<=rad;x+=2.0) {