svn merge ^/trunk/blender -r40491:40498
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 13:55:06 +0000 (13:55 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 13:55:06 +0000 (13:55 +0000)
commitd7a5429f421c9677035a91553c882a4d10e56086
treefdbb8251bb79b8fa9ded68215ef6cf1912ec1660
parent38132d68d6387f5cfd988521d322cf57837d9b5c
parentc658b74db5a9b469393cb02133731fdcb01bcdf7
svn merge ^/trunk/blender -r40491:40498
source/blender/blenkernel/intern/DerivedMesh.c