Merged changes in the trunk up to revision 39661.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 24 Aug 2011 00:18:26 +0000 (00:18 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 24 Aug 2011 00:18:26 +0000 (00:18 +0000)
commit33bb1ed53ee7527b507c4f30a9a0c46dcf0ac415
tree5d595d29c92680382eb0ad9aac0c973e65c2ea4b
parentf631d3aaa938df9af10c4cb747601d7b22724d7d
parent3bb397be76e99a0ea0851179bb264df02b9f244c
Merged changes in the trunk up to revision 39661.
14 files changed:
build_files/scons/tools/Blender.py
doc/python_api/sphinx_doc_gen.py
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/render/SConscript
source/blender/editors/render/render_shading.c
source/blender/editors/transform/transform.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_scene.c
source/blender/render/SConscript
source/creator/CMakeLists.txt
source/creator/creator.c