Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 6 Sep 2018 04:42:59 +0000 (14:42 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 6 Sep 2018 04:43:47 +0000 (14:43 +1000)
commit1f22ef34bbb13e17dd5e4f4c573bdcccc146fb3a
tree46242e35b1f990c7ab3e12bb72bc6911892ae939
parent31026f8c0e17b04f823b0fae808065b66841af6d
parentf5daa58242a1b42fea7a15039968499318978842
Merge branch 'master' into blender2.8
source/blender/editors/space_view3d/view3d_gizmo_ruler.c
source/blender/editors/space_view3d/view3d_ruler.c