svn merge -r40197:40311 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Sun, 18 Sep 2011 02:35:26 +0000 (02:35 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 18 Sep 2011 02:35:26 +0000 (02:35 +0000)
commit96ada15d7940a72744dc1a63f13dbd9383b42a11
tree4e5527c0be1706fa28f715305d7f5b8eea4379ae
parent1b5d16f1bf80f2da8d3d4da5bbfaf4819c14a225
parent5db33d11bd569f4040fd58e4f39cf97ed94fec29
svn merge -r40197:40311 ^/trunk/blender
source/blender/blenkernel/intern/armature.c
source/blender/editors/armature/editarmature.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c