Merged changes in the trunk up to revision 36092.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 11 Apr 2011 00:09:56 +0000 (00:09 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 11 Apr 2011 00:09:56 +0000 (00:09 +0000)
commit3df52d4e19790df7a7a9c80e37c5724613427b86
tree61852324bffcf7dfe7ac4e5c37fa881e68d49e3b
parent09c7d5aeb84443feabb5d8e03bf268cfe7a34acc
parente37dc17991668d696497b5af70ad8133db71b107
Merged changes in the trunk up to revision 36092.

Conflicts resolved:
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/render/intern/source/pipeline.c
19 files changed:
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/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/render/render_shading.c
source/blender/editors/transform/transform.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/bpy.c
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
source/creator/creator.c