Merged changes in the trunk up to revision 32684.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 24 Oct 2010 13:05:09 +0000 (13:05 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 24 Oct 2010 13:05:09 +0000 (13:05 +0000)
commit3b2515ba0e71aeefb7ba43d7cede9fb05259b7f6
treef50dd3c9c81675a8e354097f09b151b2a3cd4e1e
parent86e433728d8e45716537e1a6ac0719383bd10aa0
parenta301d2c898ed353aa6902a4893574ab24b7a2b4e
Merged changes in the trunk up to revision 32684.
15 files changed:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/render/CMakeLists.txt
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_ID.c
source/blender/python/CMakeLists.txt
source/blender/render/CMakeLists.txt
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeoutput.c
source/creator/CMakeLists.txt
source/creator/creator.c