Merged changes in the trunk up to revision 35505.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 13 Mar 2011 02:10:39 +0000 (02:10 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 13 Mar 2011 02:10:39 +0000 (02:10 +0000)
commitc8deda32763d68b59d28f00734785dc0c7a91571
treed5b7320d79136c7c2d0282fe45ec3be619ec6806
parent33efa9eeb63db672d9da97b68718aefb14b98f64
parent25a2eb4675f8e1fcf8b990bc345aac694dba8228
Merged changes in the trunk up to revision 35505.

Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
14 files changed:
release/scripts/ui/properties_render.py
release/scripts/ui/space_dopesheet.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/intern/idcode.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_material_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/CMakeLists.txt
source/blender/python/intern/bpy.c
source/blender/render/intern/source/shadeinput.c
source/blender/render/intern/source/shadeoutput.c
source/creator/CMakeLists.txt