svn merge ^/trunk/blender -r42991:43009
authorCampbell Barton <ideasman42@gmail.com>
Sat, 31 Dec 2011 03:07:14 +0000 (03:07 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 31 Dec 2011 03:07:14 +0000 (03:07 +0000)
commit81f5c9ed9b8193864f1c6160aed9eef9338f0d27
treede71a52d3ed2c5a1fd47a846af5d68e1c571e606
parent50ca81154e5ead104723ba137942e92cb860ace8
parent792452a7e53aa92361145e415491943bc91d8a6e
svn merge ^/trunk/blender -r42991:43009
14 files changed:
source/blender/blenkernel/intern/constraint.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c