[Bf-blender-cvs] [dce6d7b] multiview: small cleanup on image.c

Dalai Felinto noreply at git.blender.org
Tue Feb 10 05:09:46 CET 2015


Commit: dce6d7b1ec6738e336afb760e18e45307ea5cf68
Author: Dalai Felinto
Date:   Tue Feb 10 01:32:39 2015 -0200
Branches: multiview
https://developer.blender.org/rBdce6d7b1ec6738e336afb760e18e45307ea5cf68

small cleanup on image.c

===================================================================

M	source/blender/blenkernel/intern/image.c

===================================================================

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 1a77df1..c980476 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -3177,7 +3177,7 @@ static ImBuf *image_load_sequence_multilayer(Image *ima, ImageUser *iuser, int f
 	return ibuf;
 }
 
-static struct ImBuf *load_movie_single(Image *ima, ImageUser *iuser, int frame, const size_t view_id)
+static ImBuf *load_movie_single(Image *ima, ImageUser *iuser, int frame, const size_t view_id)
 {
 	struct ImBuf *ibuf = NULL;
 	ImageAnim *ia;
@@ -3272,7 +3272,7 @@ static ImBuf *image_load_movie_file(Image *ima, ImageUser *iuser, int frame)
 				image_assign_ibuf(ima, ibuf_arr[i], i, frame);
 			}
 			else {
-				ima->ok &= 0;
+				ima->ok = 0;
 			}
 		}
 
@@ -3296,10 +3296,10 @@ static ImBuf *image_load_movie_file(Image *ima, ImageUser *iuser, int frame)
 	return ibuf;
 }
 
-static struct ImBuf *load_image_single(Image *ima, ImageUser *iuser, int cfra,
-                                       const size_t view_id,
-                                       const bool has_packed,
-                                       bool *r_assign)
+static ImBuf *load_image_single(Image *ima, ImageUser *iuser, int cfra,
+                                const size_t view_id,
+                                const bool has_packed,
+                                bool *r_assign)
 {
 	char filepath[FILE_MAX];
 	struct ImBuf *ibuf = NULL;




More information about the Bf-blender-cvs mailing list