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)
1  2 
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