Merged changes in the trunk up to revision 41225.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 29 Oct 2011 15:46:14 +0000 (15:46 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 29 Oct 2011 15:46:14 +0000 (15:46 +0000)
commit16702c172939a399ddd0e61fc14a8b0944c4249b
tree130c9c0e6f62af167309f22f720a4f7deacd8f2d
parentf0ca79bccb5e8290d02318b81aebdeb713180886
parentf1cea89d99f0c80bdccd2ba1359142b5ff14cdb9
Merged changes in the trunk up to revision 41225.

Conflicts resolved:
source/blender/render/intern/source/pipeline.c
33 files changed:
build_files/scons/tools/Blender.py
doc/python_api/sphinx_doc_gen.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/BME_conversions.c
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/linestyle.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/CMakeLists.txt
source/blender/render/SConscript
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt
source/creator/creator.c