svn merge ^/trunk/blender -r46930:HEAD
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Fri, 25 May 2012 17:52:51 +0000 (17:52 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Fri, 25 May 2012 17:52:51 +0000 (17:52 +0000)
commit2c8a7ac75662514d248806c80502155d0b4aa421
treecfdc7ab4c3bf036b93a2ecf7d37b7ea30f7e9a62
parentc2c2611faa26cb7ebd1126ebe30520164a183184
parent3fe10d475fa41d31ee143294dce4c0f335e5ffc5
svn merge ^/trunk/blender -r46930:HEAD
source/blender/editors/object/object_vgroup.c