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)
commit47463742e264d5bfbf81215ea7d907c4e9a3a1e1
treebab7eea6ec1903c5922d3d9dcea9c99a4b1cc42e
parent4cd1e6337e516015383f3c47886b180ee16d2e3a
parent5b6224c84719213883334bcd9d2c46216053fe35
Cycles: svn merge -r41232:41266 ^/trunk/blender
source/blender/imbuf/CMakeLists.txt
source/blender/makesdna/DNA_ID.h
source/blender/makesrna/intern/rna_ID.c