svn merge ^/trunk/blender -r43117:43124
authorCampbell Barton <ideasman42@gmail.com>
Wed, 4 Jan 2012 12:57:15 +0000 (12:57 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 4 Jan 2012 12:57:15 +0000 (12:57 +0000)
commite2e5cb881c3a687ece844684be9c2bc5b253e57c
tree55ff688081e4b82df092eb3b80889fa570af6c00
parentd0cdefd9fa37bf6788dad27b87d8d569c58ad94a
parent49cf3c76a93c8e41ddbece82f629e90c21651d19
svn merge ^/trunk/blender -r43117:43124
source/blender/editors/space_view3d/view3d_snap.c