Merged changes in the trunk up to revision 55700.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 1 Apr 2013 13:47:19 +0000 (13:47 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 1 Apr 2013 13:47:19 +0000 (13:47 +0000)
commit5524ed9ba2d60331abed47c9df0bc2fcf330b36b
treee8380010f140f022b77236af171d97083a294006
parent1360bb6fb0bf0c5c14235c47bf1399accbcecc6f
parent689f3aa174ff795044a4dab719edf60b7b1f5bd3
Merged changes in the trunk up to revision 55700.

Conflicts resolved:
source/blender/editors/mesh/mesh_intern.h
30 files changed:
CMakeLists.txt
build_files/scons/config/win32-mingw-config.py
build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-mingw-config.py
build_files/scons/config/win64-vc-config.py
intern/cycles/blender/addon/ui.py
release/scripts/startup/bl_ui/properties_render.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenfont/BLF_translation.h
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/editors/mesh/CMakeLists.txt
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/mesh_intern.h
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt