Merged changes in the trunk up to revision 28911.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 21 May 2010 22:01:47 +0000 (22:01 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 21 May 2010 22:01:47 +0000 (22:01 +0000)
commitdbcb73c033fc15fc0df2ab0a05ac0b2c4a9a31b1
tree630247e3c4b18a799545bee8de23ee075cfa5a79
parentf76c3aa3764283918413a50ed9dab079e720ed98
parentc0a0f2c43e934e2054eefe5bf90889cf67b736f9
Merged changes in the trunk up to revision 28911.
13 files changed:
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenloader/intern/readfile.c
source/blender/editors/CMakeLists.txt
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/doc/sphinx_doc_gen.py
source/creator/CMakeLists.txt
source/creator/SConscript
source/creator/creator.c