Merge branch 'master' of git@git.blender.org:blender.git into blender2.8
authormano-wii <germano.costa@ig.com.br>
Thu, 13 Jul 2017 23:12:17 +0000 (20:12 -0300)
committermano-wii <germano.costa@ig.com.br>
Thu, 13 Jul 2017 23:12:17 +0000 (20:12 -0300)
commitf4155d3778ba883566eeb87d16218c4c275ffc04
tree78106b5fbe0ff915e97692bf5fed610741f5179b
parentad7f782e17201d5af894ffffdc45b07dadfea229
parentc9817c67fc141ca85a6e1f9e42d9fa081ede38c7
Merge branch 'master' of git@git.blender.org:blender.git into blender2.8

# Conflicts:
# source/blender/editors/transform/transform_snap_object.c
source/blender/editors/transform/transform_snap_object.c