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

[Campbell Barton]

Commit: 4887205f32c3f44bfcacb9244b0533fc3f2e9c6a
Author: Campbell Barton
Date:   Tue Apr 16 15:46:19 2019 +0200
Branches: temp-clang-format
https://developer.blender.org/rB4887205f32c3f44bfcacb9244b0533fc3f2e9c6a

Merge branch 'master' into temp-clang-format

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



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