[Bf-blender-cvs] [1bbc1eed622] master: Cleanup: clang-format

[Brecht Van Lommel]

Commit: 1bbc1eed6221fcdfad9c160d2979040d44aa888e
Author: Brecht Van Lommel
Date:   Tue Feb 25 15:11:33 2020 +0100
Branches: master
https://developer.blender.org/rB1bbc1eed6221fcdfad9c160d2979040d44aa888e

Cleanup: clang-format

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

M	source/blender/editors/interface/interface_ops.c
M	source/blender/gpu/shaders/gpu_shader_text_frag.glsl
M	source/blender/makesrna/intern/rna_nodetree.c

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

diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c
index 487d0098927..093f063ebea 100644
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -800,7 +800,8 @@ bool UI_context_copy_to_selected_list(bContext *C,
     *r_lb = CTX_data_collection_get(C, "selected_editable_fcurves");
   }
   else if (RNA_struct_is_a(ptr->type, &RNA_Constraint) &&
-           (path_from_bone = RNA_path_resolve_from_type_to_property(ptr, prop, &RNA_PoseBone)) != NULL) {
+           (path_from_bone = RNA_path_resolve_from_type_to_property(ptr, prop, &RNA_PoseBone)) !=
+               NULL) {
     *r_lb = CTX_data_collection_get(C, "selected_pose_bones");
     *r_path = path_from_bone;
   }
diff --git a/source/blender/gpu/shaders/gpu_shader_text_frag.glsl b/source/blender/gpu/shaders/gpu_shader_text_frag.glsl
index 554596fa9ae..cc12e3f78a5 100644
--- a/source/blender/gpu/shaders/gpu_shader_text_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_text_frag.glsl
@@ -30,20 +30,21 @@ const vec2 offsets16[16] = vec2[16](vec2(-1.5, 1.5),
                                     vec2(1.5, -1.5));
 
 //#define GPU_NEAREST
-#define sample_glyph_offset(texel, ofs) texture_1D_custom_bilinear_filter(texCoord_interp + ofs * texel)
+#define sample_glyph_offset(texel, ofs) \
+  texture_1D_custom_bilinear_filter(texCoord_interp + ofs * texel)
 
 float texel_fetch(int index)
 {
-    int size_x = textureSize(glyph, 0).r;
-    if (index >= size_x) {
-        return texelFetch(glyph, ivec2(index % size_x, index / size_x), 0).r;
-    }
-    return texelFetch(glyph, ivec2(index, 0), 0).r;
+  int size_x = textureSize(glyph, 0).r;
+  if (index >= size_x) {
+    return texelFetch(glyph, ivec2(index % size_x, index / size_x), 0).r;
+  }
+  return texelFetch(glyph, ivec2(index, 0), 0).r;
 }
 
 bool is_inside_box(ivec2 v)
 {
-    return all(greaterThanEqual(v, ivec2(0))) && all(lessThan(v, glyph_dim));
+  return all(greaterThanEqual(v, ivec2(0))) && all(lessThan(v, glyph_dim));
 }
 
 float texture_1D_custom_bilinear_filter(vec2 uv)
@@ -60,7 +61,7 @@ float texture_1D_custom_bilinear_filter(vec2 uv)
 
 #ifdef GPU_NEAREST
   return tl;
-#else //GPU_LINEAR
+#else  // GPU_LINEAR
   int offset_x = 1;
   int offset_y = glyph_dim.x;
 
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 994d0471113..c4672ead29d 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -131,11 +131,7 @@ const EnumPropertyItem rna_enum_vector_rotate_type_items[] = {
     {NODE_VECTOR_ROTATE_TYPE_AXIS_X, "X_AXIS", 0, "X Axis", "Rotate a point using X axis"},
     {NODE_VECTOR_ROTATE_TYPE_AXIS_Y, "Y_AXIS", 0, "Y Axis", "Rotate a point using Y axis"},
     {NODE_VECTOR_ROTATE_TYPE_AXIS_Z, "Z_AXIS", 0, "Z Axis", "Rotate a point using Z axis"},
-    {NODE_VECTOR_ROTATE_TYPE_EULER_XYZ,
-     "EULER_XYZ",
-     0,
-     "Euler",
-     "Rotate a point using XYZ order"},
+    {NODE_VECTOR_ROTATE_TYPE_EULER_XYZ, "EULER_XYZ", 0, "Euler", "Rotate a point using XYZ order"},
     {0, NULL, 0, NULL, NULL},
 };