Merged changes in the trunk up to revision 37539.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 16 Jun 2011 05:50:13 +0000 (05:50 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 16 Jun 2011 05:50:13 +0000 (05:50 +0000)
commit17ee056fc6d15abc4b69a24ceac0e7f3d4dffa47
tree23d28adc5ce3d24da631131bd1255410d0df23b5
parent32c7e22d3696e3575f4b7d05c1f7140591e88809
parent2e8ca6d1965bdcaaab672561aa2deddaf6b8f8b3
Merged changes in the trunk up to revision 37539.

Conflicts resolved:
source/blender/render/intern/source/pipeline.c

Also fixed an inconsistent conflict resolution in the last commit with
regard to release/scripts/startup/bl_ui/properties_render.py.  This
problem resulted in empty menus in the GUI.
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/makesdna/DNA_scene_types.h
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/creator/CMakeLists.txt