svn merge -r37500:37600 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Sun, 24 Jul 2011 13:21:54 +0000 (13:21 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 24 Jul 2011 13:21:54 +0000 (13:21 +0000)
commitb709b52f4636b3e6b33ad6cf48cc5695c49950ed
treea80a97d4a7da92bdb2371205871031e66db5c1bb
parent97d0846d2c4eb1610ca90120a8152b9dc54c5c57
parentf69d80533833910baef04f97d60eeaab34e452eb
svn merge -r37500:37600 https://svn.blender.org/svnroot/bf-blender/trunk/blender
15 files changed:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_snap.c
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/windowmanager/intern/wm_init_exit.c