Merge branch 'master' into blender2.8
authormano-wii <germano.costa@ig.com.br>
Fri, 21 Jul 2017 17:20:24 +0000 (14:20 -0300)
committermano-wii <germano.costa@ig.com.br>
Fri, 21 Jul 2017 17:20:24 +0000 (14:20 -0300)
commit64fd45b1dfe5eceb8c1d2a6f04377ee202da2a3b
tree0f20fd66e0b194c54a4d6b862b2f81af8e81aa99
parent122706db9cd23c88775474750e99b57e74a3b9e5
parent34f0250f323cb2ef762aeeb6e661fce3af78257d
Merge branch 'master' into blender2.8

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