[Bf-blender-cvs] [11480763b62] master: Cleanup: format

Campbell Barton noreply at git.blender.org
Thu May 26 04:14:12 CEST 2022


Commit: 11480763b62e6ca72ae869391b8e5495e57410a6
Author: Campbell Barton
Date:   Thu May 26 12:13:45 2022 +1000
Branches: master
https://developer.blender.org/rB11480763b62e6ca72ae869391b8e5495e57410a6

Cleanup: format

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

M	source/blender/draw/intern/shaders/common_subdiv_ibo_lines_comp.glsl
M	source/blender/draw/intern/shaders/common_subdiv_ibo_tris_comp.glsl
M	source/blender/draw/intern/shaders/common_subdiv_patch_evaluation_comp.glsl
M	source/blender/makesrna/RNA_access.h

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

diff --git a/source/blender/draw/intern/shaders/common_subdiv_ibo_lines_comp.glsl b/source/blender/draw/intern/shaders/common_subdiv_ibo_lines_comp.glsl
index 5084dcc0746..3244b7960d8 100644
--- a/source/blender/draw/intern/shaders/common_subdiv_ibo_lines_comp.glsl
+++ b/source/blender/draw/intern/shaders/common_subdiv_ibo_lines_comp.glsl
@@ -35,7 +35,8 @@ void emit_line(uint line_offset, uint quad_index, uint start_loop_index, uint co
   uint coarse_quad_index = coarse_polygon_index_from_subdiv_quad_index(quad_index,
                                                                        coarse_poly_count);
 
-  if (is_face_hidden(coarse_quad_index) || (input_origindex[vertex_index] == ORIGINDEX_NONE && optimal_display)) {
+  if (is_face_hidden(coarse_quad_index) ||
+      (input_origindex[vertex_index] == ORIGINDEX_NONE && optimal_display)) {
     output_lines[line_offset + 0] = 0xffffffff;
     output_lines[line_offset + 1] = 0xffffffff;
   }
@@ -62,13 +63,13 @@ void main()
   uint loop_index = num_subdiv_loops + index * 2;
 
   if (lines_loose_flags[index] != 0) {
-      /* Line is hidden. */
-      output_lines[line_offset] = 0xffffffff;
-      output_lines[line_offset + 1] = 0xffffffff;
+    /* Line is hidden. */
+    output_lines[line_offset] = 0xffffffff;
+    output_lines[line_offset + 1] = 0xffffffff;
   }
   else {
-      output_lines[line_offset] = loop_index;
-      output_lines[line_offset + 1] = loop_index + 1;
+    output_lines[line_offset] = loop_index;
+    output_lines[line_offset + 1] = loop_index + 1;
   }
 
 #else
diff --git a/source/blender/draw/intern/shaders/common_subdiv_ibo_tris_comp.glsl b/source/blender/draw/intern/shaders/common_subdiv_ibo_tris_comp.glsl
index f1275b36c34..ce3c8478d3f 100644
--- a/source/blender/draw/intern/shaders/common_subdiv_ibo_tris_comp.glsl
+++ b/source/blender/draw/intern/shaders/common_subdiv_ibo_tris_comp.glsl
@@ -46,19 +46,19 @@ void main()
 #endif
 
   if (is_face_hidden(coarse_quad_index)) {
-      output_tris[triangle_loop_index + 0] = 0xffffffff;
-      output_tris[triangle_loop_index + 1] = 0xffffffff;
-      output_tris[triangle_loop_index + 2] = 0xffffffff;
-      output_tris[triangle_loop_index + 3] = 0xffffffff;
-      output_tris[triangle_loop_index + 4] = 0xffffffff;
-      output_tris[triangle_loop_index + 5] = 0xffffffff;
+    output_tris[triangle_loop_index + 0] = 0xffffffff;
+    output_tris[triangle_loop_index + 1] = 0xffffffff;
+    output_tris[triangle_loop_index + 2] = 0xffffffff;
+    output_tris[triangle_loop_index + 3] = 0xffffffff;
+    output_tris[triangle_loop_index + 4] = 0xffffffff;
+    output_tris[triangle_loop_index + 5] = 0xffffffff;
   }
   else {
-      output_tris[triangle_loop_index + 0] = loop_index + 0;
-      output_tris[triangle_loop_index + 1] = loop_index + 1;
-      output_tris[triangle_loop_index + 2] = loop_index + 2;
-      output_tris[triangle_loop_index + 3] = loop_index + 0;
-      output_tris[triangle_loop_index + 4] = loop_index + 2;
-      output_tris[triangle_loop_index + 5] = loop_index + 3;
-   }
+    output_tris[triangle_loop_index + 0] = loop_index + 0;
+    output_tris[triangle_loop_index + 1] = loop_index + 1;
+    output_tris[triangle_loop_index + 2] = loop_index + 2;
+    output_tris[triangle_loop_index + 3] = loop_index + 0;
+    output_tris[triangle_loop_index + 4] = loop_index + 2;
+    output_tris[triangle_loop_index + 5] = loop_index + 3;
+  }
 }
diff --git a/source/blender/draw/intern/shaders/common_subdiv_patch_evaluation_comp.glsl b/source/blender/draw/intern/shaders/common_subdiv_patch_evaluation_comp.glsl
index b2860e58b5c..cfe469a6283 100644
--- a/source/blender/draw/intern/shaders/common_subdiv_patch_evaluation_comp.glsl
+++ b/source/blender/draw/intern/shaders/common_subdiv_patch_evaluation_comp.glsl
@@ -424,10 +424,10 @@ void main()
   output_nors[coarse_quad_index] = fnor;
 
   if (is_face_hidden(coarse_quad_index)) {
-      output_indices[coarse_quad_index] = 0xffffffff;
+    output_indices[coarse_quad_index] = 0xffffffff;
   }
   else {
-      output_indices[coarse_quad_index] = coarse_quad_index;
+    output_indices[coarse_quad_index] = coarse_quad_index;
   }
 }
 #else
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 4e8a6a42059..f0a60929431 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -413,7 +413,8 @@ int RNA_property_collection_lookup_string(PointerRNA *ptr,
                                           PropertyRNA *prop,
                                           const char *key,
                                           PointerRNA *r_ptr);
-int RNA_property_collection_lookup_string_index(PointerRNA *ptr, PropertyRNA *prop, const char *key, PointerRNA *r_ptr, int *r_index);
+int RNA_property_collection_lookup_string_index(
+    PointerRNA *ptr, PropertyRNA *prop, const char *key, PointerRNA *r_ptr, int *r_index);
 /**
  * Zero return is an assignment error.
  */



More information about the Bf-blender-cvs mailing list