[Bf-blender-cvs] [a35c635edb3] tmp-overlay-engine: Merge branch 'master' into tmp-overlay-engine

[Clément Foucault]

Commit: a35c635edb3db548e11555024ec3a384f93ce352
Author: Clément Foucault
Date:   Mon Dec 2 01:40:58 2019 +0100
Branches: tmp-overlay-engine
https://developer.blender.org/rBa35c635edb3db548e11555024ec3a384f93ce352

Merge branch 'master' into tmp-overlay-engine

# Conflicts:
#	source/blender/draw/modes/paint_texture_mode.c

===================================================================



===================================================================