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

effects/boxblur.frag

@@ -18,10 +18,12 @@ void main(void) {
 		float divider = 1.0;
 		if (horiz_blur) divider /= rad;
 		if (vert_blur) divider /= rad;
+		vec4 color = vec4(0.0);
 		for (float x=-x_rad+0.5;x<=x_rad;x+=2.0) {					
 			for (float y=-y_rad+0.5;y<=y_rad;y+=2.0) {
-				gl_FragColor += texture2D(image, (vec2(gl_FragCoord.x+x, gl_FragCoord.y+y))/resolution)*(divider);
+				color += texture2D(image, (vec2(gl_FragCoord.x+x, gl_FragCoord.y+y))/resolution)*(divider);
 			}
 		}
+		gl_FragColor = color;
 	}
 }

effects/directionalblur.frag

@@ -17,11 +17,13 @@ void main(void) {
 		float sin_angle = sin(radians);
 		float cos_angle = cos(radians);
 
+		vec4 color = vec4(0.0);
 		for (float i=-ceillen+0.5;i<=ceillen;i+=2.0) {
 			float y = sin_angle * i;
 			float x = cos_angle * i;
-			gl_FragColor += texture2D(image, vec2(gl_FragCoord.x+x, gl_FragCoord.y+y)/resolution)*(divider);
+			color += texture2D(image, vec2(gl_FragCoord.x+x, gl_FragCoord.y+y)/resolution)*(divider);
 		}
+		gl_FragColor = color;
 	} else {
 		gl_FragColor = texture2D(image, gl_FragCoord.xy/resolution);
 	}

effects/gaussianblur.frag

@@ -36,11 +36,13 @@ void main(void) {
 			}
 		}
 
+		vec4 color = vec4(0.0);
 		for (float x=-x_rad+0.5;x<=x_rad;x+=2.0) {
 			for (float y=-y_rad+0.5;y<=y_rad;y+=2.0) {
 				float weight = (gaussian2(x, y, sigma)/sum);
-				gl_FragColor += texture2D(image, (vec2(gl_FragCoord.x+x, gl_FragCoord.y+y))/resolution)*(weight);
+				color += texture2D(image, (vec2(gl_FragCoord.x+x, gl_FragCoord.y+y))/resolution)*(weight);
 			}
 		}
+		gl_FragColor = color;
 	}	
 }

effects/radialblur.frag

@@ -22,11 +22,15 @@ void main(void) {
 		float limit = ceil(radius * multiplier);
 
 		float divider = 1.0 / limit;
+
+		vec4 color = vec4(0.0);
+
 		for (float i=-limit+0.5;i<=limit;i+=2.0) {
 			float y = sin_angle * i;
 			float x = cos_angle * i;
-			gl_FragColor += texture2D(image, vec2(gl_FragCoord.x+x, gl_FragCoord.y+y)/resolution)*(divider);
+			color += texture2D(image, vec2(gl_FragCoord.x+x, gl_FragCoord.y+y)/resolution)*(divider);
 		}
+		gl_FragColor = color;
 	} else {
 		gl_FragColor = texture2D(image, gl_FragCoord.xy/resolution);
 	}

io/loadthread.cpp

@@ -621,8 +621,6 @@ void LoadThread::run() {
     }
 
     if (cont) {
-        panel_project->add_recent_project(project_url);
-
         emit success(); // run in main thread
 
         for (int i=0;i<loaded_media_items.size();i++) {
@@ -665,7 +663,9 @@ void LoadThread::success_func() {
 			counter++;
 		}
 		mainWindow->updateTitle(orig_filename);
-	}
+    } else {
+        panel_project->add_recent_project(project_url);
+    }
 
     mainWindow->setWindowModified(autorecovery);
     if (open_seq != NULL) set_sequence(open_seq);