svn merge ^/trunk/blender -r43461:43472
authorCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jan 2012 21:08:25 +0000 (21:08 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jan 2012 21:08:25 +0000 (21:08 +0000)
commit0f28c1c27aec41dd22e31aac2c02cdfae785dd1b
tree1c41b37d29a56390d810846cd7fe8f1218e40576
parent9be40c026df54fee796c4073ebd4734c55ed5807
parent408f7963c5cfd65792d826390b01896282de8e97
svn merge ^/trunk/blender -r43461:43472
26 files changed:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_mesh.h
source/blender/blenlib/BLI_math_vector.h
source/blender/blenlib/intern/math_vector_inline.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/ED_mesh.h
source/blender/editors/include/ED_uvedit.h
source/blender/editors/include/ED_view3d.h
source/blender/editors/mesh/bmeshutils.c
source/blender/editors/object/object_edit.c
source/blender/editors/sculpt_paint/CMakeLists.txt
source/blender/editors/sculpt_paint/SConscript
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/sculpt_uv.c
source/blender/editors/space_image/space_image.c
source/blender/editors/uvedit/CMakeLists.txt
source/blender/editors/uvedit/uvedit_draw.c
source/blender/editors/uvedit/uvedit_intern.h
source/blender/editors/uvedit/uvedit_ops.c
source/blender/editors/uvedit/uvedit_parametrizer.c
source/blender/editors/uvedit/uvedit_smart_stitch.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blenderplayer/bad_level_call_stubs/stubs.c