svn merge ^/trunk/blender -r40382:r40389
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 06:43:06 +0000 (06:43 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 06:43:06 +0000 (06:43 +0000)
commit049c18405af788af57a1ebe2f396cc0cc8a16b6e
tree96ff414cec0d5e4a21c02bee1661fd2769dc3223
parent91587ed30217905213f72a473122fc95d483ad70
parente1de1214a44c23ae0a7826ea6867b5da6dc58d60
svn merge ^/trunk/blender -r40382:r40389
source/blender/editors/transform/transform_conversions.c
source/blender/editors/uvedit/uvedit_ops.c