Merged changes in the trunk up to revision 43748.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 29 Jan 2012 12:00:04 +0000 (12:00 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 29 Jan 2012 12:00:04 +0000 (12:00 +0000)
commit831f33998060abf76ce1dfa26a08397121210e86
treedfc5e5e5c3e588d0398bb9fa5656ea1dea9432bb
parent12baf364f528f11db8f9c9d139ef97f657145c8f
parentd4584dfd23ab4880cc6e2f7f6d699ea3c9687d22
Merged changes in the trunk up to revision 43748.

Conflicts resolved:
source/blender/editors/include/UI_resources.h
15 files changed:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c