From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Mon, 24 Oct 2011 22:51:44 +0000 (+0000)
Subject: Cycles: svn merge -r41232:41266 ^/trunk/blender
X-Git-Url: https://git.blender.org/gitweb/gitweb.cgi/blender-staging.git/commitdiff_plain/47463742e264d5bfbf81215ea7d907c4e9a3a1e1

Cycles: svn merge -r41232:41266 ^/trunk/blender
---

47463742e264d5bfbf81215ea7d907c4e9a3a1e1
diff --cc source/blender/imbuf/CMakeLists.txt
index 76c69292b0f,1b190ae96de..6aef9a4254e
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@@ -61,7 -61,7 +61,8 @@@ set(SR
  	intern/md5.c
  	intern/metadata.c
  	intern/module.c
+ 	intern/moviecache.c
 +	intern/openimageio.cpp
  	intern/png.c
  	intern/readimage.c
  	intern/rectop.c