[Bf-blender-cvs] [1a8f642b4fc] temp-clang-format: Merge branch 'master' into temp-clang-format

[Campbell Barton]

Commit: 1a8f642b4fcd92a973aaae6292f7338e40750550
Author: Campbell Barton
Date:   Tue Apr 16 12:57:37 2019 +0200
Branches: temp-clang-format
https://developer.blender.org/rB1a8f642b4fcd92a973aaae6292f7338e40750550

Merge branch 'master' into temp-clang-format

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



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