svn merge -r40117:40124 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Sun, 11 Sep 2011 13:23:30 +0000 (13:23 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 11 Sep 2011 13:23:30 +0000 (13:23 +0000)
commit297fb6d7f7085d9f19ec601ddc266ebb594b1d5e
tree416676a590dfce60a8e91de04dc580d6d31197a4
parent0383fb53414366d4ede19622fbe5bb5e6f782a0f
parentab2fc6f106f3dc29c7a07b348facf61eac11fa05
svn merge -r40117:40124 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenkernel/intern/editderivedbmesh.c
source/blender/makesrna/intern/rna_object.c