svn merge ^/trunk/blender -r43685:43693
authorCampbell Barton <ideasman42@gmail.com>
Wed, 25 Jan 2012 18:13:58 +0000 (18:13 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 25 Jan 2012 18:13:58 +0000 (18:13 +0000)
commit4fae6cd38d55997e77fdbe31e204511a2a9de154
tree4a9b2265c68af0eb0fa4486aafd8e31eaf686db9
parent75a4832af3cf1c5edb23f9816b290d6c5f61a64c
parentf99343d3b8676543e2bd6acd6ee2274c21b1b388
svn merge ^/trunk/blender -r43685:43693
source/blender/blenkernel/intern/mesh.c
source/blender/editors/armature/reeb.c
source/blender/makesrna/intern/rna_scene.c