Merged changes in the trunk up to revision 40413.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 20 Sep 2011 21:22:15 +0000 (21:22 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 20 Sep 2011 21:22:15 +0000 (21:22 +0000)
commit9c42afb1c02cafa21632bd2e19b47c012a230368
tree90d7e190e9ba59437f1e3e31337984a2200aa764
parent5582d9fac13123397297db54a0478a63a1b75194
parent8f5112f191e24aac86da7b70f461a50825e764da
Merged changes in the trunk up to revision 40413.

Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c
32 files changed:
build_files/scons/tools/Blender.py
doc/python_api/sphinx_doc_gen.py
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_nla/nla_channels.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_material_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_color.c
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/SConscript
source/blender/python/intern/CMakeLists.txt
source/blender/render/intern/source/shadeoutput.c
source/creator/CMakeLists.txt