Merged changes in the trunk up to revision 52815.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 8 Dec 2012 12:35:14 +0000 (12:35 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 8 Dec 2012 12:35:14 +0000 (12:35 +0000)
commitec33687d6cf74775e37fdc1a14e22dea08289cb1
treea98875cf3deae05c46cdd70192858b8844ab1ea4
parent724746dba2deed8e336fc66b36bfc3b5b1858a8e
parent7b9adab594d1cc670d642b56ae8d76069ce91107
Merged changes in the trunk up to revision 52815.
15 files changed:
build_files/scons/tools/Blender.py
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/scene.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_buttons/buttons_context.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_userdef.c