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

[Campbell Barton]

Commit: d5a756da5a9285ce8c870d52604a7319a351d124
Author: Campbell Barton
Date:   Tue Apr 16 09:52:33 2019 +0200
Branches: temp-clang-format
https://developer.blender.org/rBd5a756da5a9285ce8c870d52604a7319a351d124

Merge branch 'master' into temp-clang-format

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



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