Merged changes in the trunk up to revision 32124.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 25 Sep 2010 21:03:16 +0000 (21:03 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 25 Sep 2010 21:03:16 +0000 (21:03 +0000)
commitdf528a92097d42e5f5d18ecb9f2981d75546b4d5
treec399cfe768ca1ce571e30903387406570c8306e6
parentaf07527d35bafe0e3dad6cac9fdc81a435db0c77
parent4127dba12c4a7e7bfd90b151ce0b873ea964e293
Merged changes in the trunk up to revision 32124.
17 files changed:
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/render/CMakeLists.txt
source/blender/editors/render/render_shading.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/doc/sphinx_doc_gen.py
source/blender/render/intern/source/shadeinput.c