Merge branch 'master' into blender2.8
authormano-wii <germano.costa@ig.com.br>
Fri, 14 Jul 2017 19:56:36 +0000 (16:56 -0300)
committermano-wii <germano.costa@ig.com.br>
Fri, 14 Jul 2017 19:56:36 +0000 (16:56 -0300)
commit37242f0a47bf811610d24ed53431956bc199ccde
tree8f6a15dde6554d520f4ff5daee61e17263d22d3b
parentebc22b44903bdd92193201144d42c03624405bc9
parent08b59ab7b928ae2c7ae96bf150a2c621f44ae786
Merge branch 'master' into blender2.8

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