Merged changes in the trunk up to revision 42556.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 10 Dec 2011 20:54:43 +0000 (20:54 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 10 Dec 2011 20:54:43 +0000 (20:54 +0000)
commitefc4341ee4d0a04d6d68f0c9cf53be4ad7e84492
treeb4502da107260e65dba4da579ae970940021e76b
parent3197796cf7aa4f1c34f2e68a2eca9d6a412a51d0
parent33b1939aee427426c214cbc060f2eac0c3d42dde
Merged changes in the trunk up to revision 42556.

Conflicts resolved:
source/blender/editors/space_view3d/drawobject.c
14 files changed:
build_files/scons/tools/Blender.py
release/scripts/startup/bl_ui/properties_render.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/mesh/editmesh_mods.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/source/pipeline.c