svn merge -r41847:41899 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Wed, 16 Nov 2011 03:10:15 +0000 (03:10 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 16 Nov 2011 03:10:15 +0000 (03:10 +0000)
commitc00c0134e0f40748885a6bbd5ef8b4ffb7c34f09
treef649494ce560f248505225b3d29972a58b1e91b5
parente6e265b2b59e02cc7816a2ed43471eca8bca0a62
parent9f46ca46a6fcdacf53d95a61147272352154204b
svn merge -r41847:41899 ^/trunk/blender
19 files changed:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/object.c
source/blender/blenlib/intern/path_util.c
source/blender/editors/curve/editcurve.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_ops.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_manipulator.c
source/blender/editors/transform/transform_snap.c
source/blender/editors/uvedit/uvedit_parametrizer.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_ui_api.c
source/blender/modifiers/intern/MOD_ocean.c
source/creator/creator.c