Merged changes in the trunk up to revision 38543.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 20 Jul 2011 23:33:10 +0000 (23:33 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 20 Jul 2011 23:33:10 +0000 (23:33 +0000)
commitce03ec4b866a3e1a6f19a266bf2c38c2c4b4afd0
treec25f25286bde21fa170dc4a8582a12c19388f4e7
parent4c3140004aa61169061ddd2628a4f2c8d88f46a1
parent76e91d7a5f8c253543bd1c938c8e74872d7a6c81
Merged changes in the trunk up to revision 38543.

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/makesdna/DNA_material_types.h
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
30 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/material.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/CMakeLists.txt
source/blender/editors/transform/transform.c
source/blender/freestyle/intern/python/BPy_Convert.h
source/blender/makesdna/DNA_material_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/SConscript
source/blender/python/intern/CMakeLists.txt
source/blender/python/intern/bpy.c
source/blender/render/CMakeLists.txt
source/blender/render/SConscript
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeinput.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt
source/creator/creator.c