Merged changes in the trunk up to revision 37799.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 25 Jun 2011 00:49:53 +0000 (00:49 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 25 Jun 2011 00:49:53 +0000 (00:49 +0000)
commitd65ebf8c847c18f8be568eab4d5c65e7b630a40f
tree2795070d936c6ec7012a0339ea74d1d4b317c3d4
parent17ee056fc6d15abc4b69a24ceac0e7f3d4dffa47
parenta03707d408b9e37cd11124c93b1516eae9522139
Merged changes in the trunk up to revision 37799.

Note for VS2008 plus CMake users:
I had to remove OpenEXR debug libs from the "blender" project properties >
Linker > Additional Dependencies.  Otherwise I got a number of linker errors
concerning duplicated symbols between libcmt.lib and libcmtd.lib.
19 files changed:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/render/CMakeLists.txt
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/CMakeLists.txt
source/blender/python/intern/bpy.c
source/blender/render/CMakeLists.txt
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeinput.c
source/blender/render/intern/source/shadeoutput.c
source/creator/CMakeLists.txt
source/creator/creator.c