Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 5 Dec 2018 00:03:48 +0000 (11:03 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 5 Dec 2018 00:03:48 +0000 (11:03 +1100)
commit9c963d363e9f392318ffd3c8f2ed15e1b84e5a51
treed58a81e53137cdcc7746f7beb6a7966203651586
parentb83cf9d340c54ec3cd5e2cde98d6dfb0e739c4bf
parent45c11c1a1bd07cca255abdb1923e69f0242c36fd
Merge branch 'master' into blender2.8
source/blender/editors/space_view3d/view3d_fly.c
source/blender/editors/space_view3d/view3d_walk.c