Merge branch 'master' into blender2.8
authormano-wii <germano.costa@ig.com.br>
Wed, 16 Aug 2017 22:10:18 +0000 (19:10 -0300)
committermano-wii <germano.costa@ig.com.br>
Wed, 16 Aug 2017 22:10:18 +0000 (19:10 -0300)
commit264d0cc6a0fc292f3e5e6ebcdbe9195fb0480279
tree3dc61a68923d05d6255cd2498b7041067da679aa
parent4b6c482d69cd35b9527dfe0d0ad7c73dfa8fb1ff
parent9b1e0f5af6f11432d7b62b5ba87a4cc0e3175bd1
Merge branch 'master' into blender2.8
source/blender/editors/include/ED_transform.h
source/blender/editors/include/ED_transform_snap_object_context.h
source/blender/editors/space_view3d/view3d_ruler.c
source/blender/editors/space_view3d/view3d_walk.c
source/blender/editors/transform/transform_snap.c
source/blender/editors/transform/transform_snap_object.c