svn merge ^/trunk/blender -r41961:41998
authorCampbell Barton <ideasman42@gmail.com>
Sun, 20 Nov 2011 01:14:33 +0000 (01:14 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 20 Nov 2011 01:14:33 +0000 (01:14 +0000)
commit3c8d86e117b54914524cbc49a8678ecaad8671cf
tree8101c8b12f888ded58d7e489e7855e754f0cf065
parent331dd678c75ba1ef4e714c989c8f1bfae35508c2
parentacf30220c9d63e0f060ee69115fe82016de025d4
svn merge ^/trunk/blender -r41961:41998
15 files changed:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/object.c
source/blender/blenlib/intern/math_geom.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform_snap.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_uvproject.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt