Cycles: svn merge -r41232:41266 ^/trunk/blender
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 24 Oct 2011 22:51:44 +0000 (22:51 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 24 Oct 2011 22:51:44 +0000 (22:51 +0000)
1  2 
source/blender/imbuf/CMakeLists.txt
source/blender/makesdna/DNA_ID.h
source/blender/makesrna/intern/rna_ID.c

index 76c69292b0ff5d0b93f1a2c583c9fc271fb44190,1b190ae96def6ffd5825abf55486d92c96c62dd2..6aef9a4254e64c2f0f088d79fbeeb02d2d131b44
@@@ -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
Simple merge