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

[Campbell Barton]

Commit: 837a4e637450a9251876b2f87716fd20f29ae710
Author: Campbell Barton
Date:   Mon Feb 4 13:20:58 2019 +1100
Branches: temp-clang-format
https://developer.blender.org/rB837a4e637450a9251876b2f87716fd20f29ae710

Merge branch 'master' into temp-clang-format

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



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

diff --cc source/blender/blenkernel/intern/unit.c
index 57f92fe958f,e274640944a..6d8b572cd09
--- a/source/blender/blenkernel/intern/unit.c
+++ b/source/blender/blenkernel/intern/unit.c
@@@ -314,10 -306,10 +314,10 @@@ static const struct bUnitCollection *bU
  	{NULL, NULL, NULL, NULL, NULL, &buNaturalRotCollection, &buNaturalTimeCollection, NULL, NULL, NULL},
  	{NULL, &buMetricLenCollection, &buMetricAreaCollection, &buMetricVolCollection, &buMetricMassCollection, &buNaturalRotCollection, &buNaturalTimeCollection, &buMetricVelCollection, &buMetricAclCollection, &buCameraLenCollection}, /* metric */
  	{NULL, &buImperialLenCollection, &buImperialAreaCollection, &buImperialVolCollection, &buImperialMassCollection, &buNaturalRotCollection, &buNaturalTimeCollection, &buImperialVelCollection, &buImperialAclCollection, &buCameraLenCollection}, /* imperial */
- 	{NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}
+ 	{NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
  };
  
 -
 +/* clang-format off */
  
  /* internal, has some option not exposed */
  static const bUnitCollection *unit_get_system(int system, int type)