Merged changes in the trunk up to revision 51863.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 4 Nov 2012 12:46:48 +0000 (12:46 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 4 Nov 2012 12:46:48 +0000 (12:46 +0000)
commit9bdfa2f9e7f6c71a58b5e7875f27971768acc0e1
treed682cc7afbd5947466853e74171680c3ddc65364
parentdd8e83606776d1d3c51cd8f5c89bf6d1a7e05f74
parent2a8ce1f12162593ad9c1db3422d35530c5d05dc2
Merged changes in the trunk up to revision 51863.
source/blender/blenkernel/intern/object.c
source/blender/editors/space_file/filelist.c
source/blender/editors/transform/transform.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/shadeoutput.c