Merged changes in the trunk up to revision 43219.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 8 Jan 2012 11:57:53 +0000 (11:57 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 8 Jan 2012 11:57:53 +0000 (11:57 +0000)
commit76a211d80947a453f594e4cf0a1e0acc6786eddf
tree59d806409fe72f733bce9c43eb6823b59642c6fd
parentf88501a44d1f519539d056a7d1f240d126a5071a
parent3dead22c7322cf72ee63a003ba50940abc12e7c9
Merged changes in the trunk up to revision 43219.

Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/pipeline.c
17 files changed:
release/scripts/startup/bl_ui/properties_render.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/render_shading.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_scene.c
source/blender/render/CMakeLists.txt
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c
source/creator/creator.c