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

[Campbell Barton]

Commit: 2aff0e24bee9a3243ffcfe3c0c34c64f1cf465bc
Author: Campbell Barton
Date:   Tue Apr 16 17:29:32 2019 +0200
Branches: temp-clang-format
https://developer.blender.org/rB2aff0e24bee9a3243ffcfe3c0c34c64f1cf465bc

Merge branch 'master' into temp-clang-format

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



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

diff --cc source/blender/blenkernel/intern/unit.c
index c14b9e04c33,5c9be274920..196083fc7fa
--- a/source/blender/blenkernel/intern/unit.c
+++ b/source/blender/blenkernel/intern/unit.c
@@@ -332,7 -332,7 +332,7 @@@ static const struct bUnitCollection *bU
  	{NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
  };
  
- /* clang-format off */
 -/* clang-format on*/
++/* clang-format on */
  
  /* internal, has some option not exposed */
  static const bUnitCollection *unit_get_system(int system, int type)