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

[Campbell Barton]

Commit: 072e2883093f91086464fa931f2cb7d8cb13302c
Author: Campbell Barton
Date:   Tue Apr 16 17:52:56 2019 +0200
Branches: temp-clang-format
https://developer.blender.org/rB072e2883093f91086464fa931f2cb7d8cb13302c

Merge branch 'master' into temp-clang-format

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



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