Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 13 Jul 2017 11:24:02 +0000 (21:24 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 13 Jul 2017 11:24:02 +0000 (21:24 +1000)
commit84c6ce6b04b1a2bf72020351f908c67dd317ec4d
tree5d4ea47b5ad62579e2aa29f7ec45365702e16cd8
parentab05108acb20203bad415e69cdf239287e41af19
parent248bba81e7a0312addaecba4626ed51f0df79161
Merge branch 'master' into blender2.8
source/blender/editors/sculpt_paint/paint_image_proj.c