[Bf-blender-cvs] [758c2210ae9] master: Cleanup: clang-format

Campbell Barton noreply at git.blender.org
Fri Mar 26 02:30:36 CET 2021


Commit: 758c2210ae9ef18f8bf7bab63c64ed482905f7b8
Author: Campbell Barton
Date:   Fri Mar 26 12:28:49 2021 +1100
Branches: master
https://developer.blender.org/rB758c2210ae9ef18f8bf7bab63c64ed482905f7b8

Cleanup: clang-format

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

M	intern/cycles/kernel/svm/svm_math_util.h
M	source/blender/blenkernel/intern/lib_override.c
M	source/blender/nodes/NOD_math_functions.hh

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

diff --git a/intern/cycles/kernel/svm/svm_math_util.h b/intern/cycles/kernel/svm/svm_math_util.h
index 389c44ab1da..19fb1da5a1f 100644
--- a/intern/cycles/kernel/svm/svm_math_util.h
+++ b/intern/cycles/kernel/svm/svm_math_util.h
@@ -242,12 +242,15 @@ ccl_device float3 svm_math_blackbody_color(float t)
     return make_float3(4.70366907f, 0.0f, 0.0f);
   }
 
+  /* Manually align for readability. */
+  /* clang-format off */
   int i = (t >= 6365.0f) ? 5 :
           (t >= 3315.0f) ? 4 :
           (t >= 1902.0f) ? 3 :
           (t >= 1449.0f) ? 2 :
           (t >= 1167.0f) ? 1 :
                            0;
+  /* clang-format on */
 
   ccl_constant float *r = blackbody_table_r[i];
   ccl_constant float *g = blackbody_table_g[i];
diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c
index a5164bd8448..c755d153100 100644
--- a/source/blender/blenkernel/intern/lib_override.c
+++ b/source/blender/blenkernel/intern/lib_override.c
@@ -1102,7 +1102,6 @@ bool BKE_lib_override_library_resync(Main *bmain,
   BKE_main_id_clear_newpoins(bmain);
   BKE_main_id_tag_all(bmain, LIB_TAG_DOIT, false); /* That one should not be needed in fact. */
 
-
   return success;
 }
 
diff --git a/source/blender/nodes/NOD_math_functions.hh b/source/blender/nodes/NOD_math_functions.hh
index 08496e044c5..45de1816549 100644
--- a/source/blender/nodes/NOD_math_functions.hh
+++ b/source/blender/nodes/NOD_math_functions.hh
@@ -379,7 +379,8 @@ inline bool try_dispatch_float_math_fl3_fl3_fl_to_fl3(const NodeVectorMathOperat
 
   switch (operation) {
     case NODE_VECTOR_MATH_REFRACT:
-      return dispatch([](float3 a, float3 b, float c) { return float3::refract(a, b.normalized(), c); });
+      return dispatch(
+          [](float3 a, float3 b, float c) { return float3::refract(a, b.normalized(), c); });
     default:
       return false;
   }



More information about the Bf-blender-cvs mailing list