[Bf-blender-cvs] [25d216724bc] master: Cleanup: make format

[Jacques Lucke]

Commit: 25d216724bc195d25aaaf336ab1cd3e7c55d78bf
Author: Jacques Lucke
Date:   Tue May 24 15:53:02 2022 +0200
Branches: master
https://developer.blender.org/rB25d216724bc195d25aaaf336ab1cd3e7c55d78bf

Cleanup: make format

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

M	intern/cycles/kernel/device/cpu/image.h
M	source/blender/draw/engines/eevee/shaders/shadow_vert.glsl
M	source/blender/draw/engines/eevee/shaders/surface_vert.glsl
M	source/blender/draw/engines/eevee_next/shaders/eevee_attributes_lib.glsl

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

diff --git a/intern/cycles/kernel/device/cpu/image.h b/intern/cycles/kernel/device/cpu/image.h
index 4963a732916..7809ec5f4a7 100644
--- a/intern/cycles/kernel/device/cpu/image.h
+++ b/intern/cycles/kernel/device/cpu/image.h
@@ -818,11 +818,13 @@ ccl_device float4 kernel_tex_image_interp_3d(KernelGlobals kg,
     case IMAGE_DATA_TYPE_NANOVDB_FLOAT3:
       return NanoVDBInterpolator<nanovdb::Vec3f>::interp_3d(info, P.x, P.y, P.z, interp);
     case IMAGE_DATA_TYPE_NANOVDB_FPN: {
-      const float f = NanoVDBInterpolator<nanovdb::FpN, float>::interp_3d(info, P.x, P.y, P.z, interp);
+      const float f = NanoVDBInterpolator<nanovdb::FpN, float>::interp_3d(
+          info, P.x, P.y, P.z, interp);
       return make_float4(f, f, f, 1.0f);
     }
     case IMAGE_DATA_TYPE_NANOVDB_FP16: {
-      const float f = NanoVDBInterpolator<nanovdb::Fp16, float>::interp_3d(info, P.x, P.y, P.z, interp);
+      const float f = NanoVDBInterpolator<nanovdb::Fp16, float>::interp_3d(
+          info, P.x, P.y, P.z, interp);
       return make_float4(f, f, f, 1.0f);
     }
 #endif
diff --git a/source/blender/draw/engines/eevee/shaders/shadow_vert.glsl b/source/blender/draw/engines/eevee/shaders/shadow_vert.glsl
index 9e136426e22..2926f8c5a89 100644
--- a/source/blender/draw/engines/eevee/shaders/shadow_vert.glsl
+++ b/source/blender/draw/engines/eevee/shaders/shadow_vert.glsl
@@ -72,13 +72,13 @@ int g_curves_attr_id = 0;
  * based on the attribute scope (point or spline). */
 int curves_attribute_element_id()
 {
-    int id = hairStrandID;
-    if (drw_curves.is_point_attribute[g_curves_attr_id] != 0) {
-        id = hair_get_base_id();
-    }
+  int id = hairStrandID;
+  if (drw_curves.is_point_attribute[g_curves_attr_id] != 0) {
+    id = hair_get_base_id();
+  }
 
-    g_curves_attr_id += 1;
-    return id;
+  g_curves_attr_id += 1;
+  return id;
 }
 
 vec4 attr_load_tangent(samplerBuffer cd_buf)
diff --git a/source/blender/draw/engines/eevee/shaders/surface_vert.glsl b/source/blender/draw/engines/eevee/shaders/surface_vert.glsl
index 013ba7e9312..a8e95e13b12 100644
--- a/source/blender/draw/engines/eevee/shaders/surface_vert.glsl
+++ b/source/blender/draw/engines/eevee/shaders/surface_vert.glsl
@@ -79,13 +79,13 @@ int g_curves_attr_id = 0;
  * based on the attribute scope (point or spline). */
 int curves_attribute_element_id()
 {
-    int id = hairStrandID;
-    if (drw_curves.is_point_attribute[g_curves_attr_id] != 0) {
-        id = hair_get_base_id();
-    }
+  int id = hairStrandID;
+  if (drw_curves.is_point_attribute[g_curves_attr_id] != 0) {
+    id = hair_get_base_id();
+  }
 
-    g_curves_attr_id += 1;
-    return id;
+  g_curves_attr_id += 1;
+  return id;
 }
 
 vec4 attr_load_tangent(samplerBuffer cd_buf)
diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_attributes_lib.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_attributes_lib.glsl
index ea9d98c5060..1b113e529b6 100644
--- a/source/blender/draw/engines/eevee_next/shaders/eevee_attributes_lib.glsl
+++ b/source/blender/draw/engines/eevee_next/shaders/eevee_attributes_lib.glsl
@@ -130,13 +130,13 @@ int g_curves_attr_id = 0;
  * based on the attribute scope (point or spline). */
 int curves_attribute_element_id()
 {
-    int id = interp.curves_strand_id;
-    if (drw_curves.is_point_attribute[g_curves_attr_id] != 0) {
-        id = hair_get_base_id();
-    }
+  int id = interp.curves_strand_id;
+  if (drw_curves.is_point_attribute[g_curves_attr_id] != 0) {
+    id = hair_get_base_id();
+  }
 
-    g_curves_attr_id += 1;
-    return id;
+  g_curves_attr_id += 1;
+  return id;
 }
 
 vec4 attr_load_tangent(samplerBuffer cd_buf)