diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-12 16:25:46 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-12 16:26:23 +0300 |
| commit | 7823ca06da0bd3d2c0eba83f9a98f5b1d1a6db7f (patch) | |
| tree | 4ccc55138cb5ceb4007267c0be9ea144efcc6a6b /source/blender/blenkernel | |
| parent | 4fae3620d0494ccc128c5e169c4a579449e28220 (diff) | |
Support metadata display in clip editor
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/movieclip.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 21ad5050fda..8367fd4369f 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -42,7 +42,7 @@ extern "C" { * and keep comment above the defines. * Use STRINGIFY() rather than defining with quotes */ #define BLENDER_VERSION 275 -#define BLENDER_SUBVERSION 0 +#define BLENDER_SUBVERSION 1 /* Several breakages with 270, e.g. constraint deg vs rad */ #define BLENDER_MINVERSION 270 #define BLENDER_MINSUBVERSION 5 diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index f063933f3f9..74758ae508b 100644 --- a/source/blender/blenkernel/intern/movieclip.c +++ b/source/blender/blenkernel/intern/movieclip.c @@ -222,7 +222,7 @@ static ImBuf *movieclip_load_sequence_file(MovieClip *clip, MovieClipUser *user, colorspace = clip->colorspace_settings.name; } - loadflag = IB_rect | IB_multilayer | IB_alphamode_detect; + loadflag = IB_rect | IB_multilayer | IB_alphamode_detect | IB_metadata; /* read ibuf */ ibuf = IMB_loadiffname(name, loadflag, colorspace); |