Merged changes in the trunk up to revision 40520.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 24 Sep 2011 21:39:11 +0000 (21:39 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 24 Sep 2011 21:39:11 +0000 (21:39 +0000)
commitc0c488d0b2cf1365c88241d98fcef19b54d2f4fe
tree38f3c8c272da55e63d27e947a3349e6797e66cc8
parent9c42afb1c02cafa21632bd2e19b47c012a230368
parent1ddb64817dadf02d006a6db5ea4ad230484b5aca
Merged changes in the trunk up to revision 40520.
15 files changed:
release/scripts/startup/bl_operators/__init__.py
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_action.c
source/blender/python/SConscript
source/blender/python/intern/CMakeLists.txt
source/blender/render/intern/source/shadeinput.c
source/blender/render/intern/source/shadeoutput.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c