svn merge ^/trunk/blender -r43345:43381
authorCampbell Barton <ideasman42@gmail.com>
Sun, 15 Jan 2012 09:16:39 +0000 (09:16 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 15 Jan 2012 09:16:39 +0000 (09:16 +0000)
commit917714acf72340bbea363c81773887c6c532c7d8
treef987aa296bb053949b2dbecf7931f4a73dc3a2db
parent3bb9c4adf985aff5e8e213807f3db0d7cd7556e7
parent5c93135ef9a1e7265ead3b92b10ea9a4ef82b909
svn merge ^/trunk/blender -r43345:43381
24 files changed:
release/scripts/presets/keyconfig/maya.py
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/space_info.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/editors/armature/editarmature.c
source/blender/editors/curve/editcurve.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/mesh_intern.h
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/metaball/mball_edit.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/editors/physics/particle_edit.c
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.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c