Merged changes in the trunk up to revision 34670.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 6 Feb 2011 18:05:05 +0000 (18:05 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 6 Feb 2011 18:05:05 +0000 (18:05 +0000)
commit5ed1597e2672cc0e59f8a1ca7c54ae3ad9206b8c
tree5fd6df223d257f82a89f3a5e20f255b31715725f
parent949a752dddacdb8f48f9ab1d5aa99da63d1da839
parent0ea9271f43e7e8ef914d33244d658ad7b5720f1f
Merged changes in the trunk up to revision 34670.
19 files changed:
doc/python_api/sphinx_doc_gen.py
release/scripts/ui/properties_render.py
release/scripts/ui/space_dopesheet.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/render/CMakeLists.txt
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeoutput.c