Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 10 Jul 2018 05:42:16 +0000 (07:42 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 10 Jul 2018 05:42:16 +0000 (07:42 +0200)
commitfc20fa29082474c624de65c57e24e317049fd4c9
tree64bda6328ff9b75a97a8a71650c50c7631f0159e
parent521f188af6bfa3e47e0aa41547502960e887b064
parentf9107eae6a30649d4637e55e8ffdb124a7b0ef7a
Merge branch 'master' into blender2.8
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_fly.c
source/blender/editors/space_view3d/view3d_walk.c
source/blender/editors/transform/transform.c