Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 8 Jun 2018 08:54:51 +0000 (10:54 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 8 Jun 2018 08:54:51 +0000 (10:54 +0200)
commit0297274720d7c61ea4ccad0b82456d680965b354
tree876647630362670b2250a00f31658c98efa63255
parentb3c8ffcb3e5312356065824f5481a906907feb80
parentdff8a7db733f1f810e868e9dffc1088017e879d0
Merge branch 'master' into blender2.8
source/blender/editors/gpencil/gpencil_paint.c