Commit: 6a0e403a17fc112eb8e4b22283045359b354bb90
Author: Antony Riakiotakis
Date: Wed Feb 4 20:46:03 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB6a0e403a17fc112eb8e4b22283045359b354bb90
Merge branch 'master' into gooseberry
Conflicts:
source/blender/blenkernel/BKE_image.h
source/blender/blenkernel/intern/sequencer.c
source/blender/imbuf/intern/anim_movie.c
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/image.c
index 9898c3b,b130372..f5f0539
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@@ -2611,7 -2616,7 +2616,7 @@@ static ImBuf *image_load_movie_file(Ima
BKE_image_user_file_path(iuser, ima, str);
/* FIXME: make several stream accessible in image editor, too*/
- ima->anim = openanim(str, IB_rect, 0,
ima->colorspace_settings.name, true);
- ima->anim = openanim(str, flags, 0,
ima->colorspace_settings.name);
++ ima->anim = openanim(str, IB_rect, 0,
ima->colorspace_settings.name);
/* let's initialize this user */
if (ima->anim && iuser && iuser->frames == 0)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
