[Bf-blender-cvs] [de610d06a6b] blender-v3.2-release: Cleanup: make format
Dalai Felinto
noreply at git.blender.org
Mon May 30 16:17:34 CEST 2022
Commit: de610d06a6b7c169c44138717a54baa890105730
Author: Dalai Felinto
Date: Mon May 30 16:17:25 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rBde610d06a6b7c169c44138717a54baa890105730
Cleanup: make 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
===================================================================
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;
+ }
}
More information about the Bf-blender-cvs
mailing list