[Bf-blender-cvs] [3b3742c75fb] master: Cleanup: trailing commas to avoid right shift
Campbell Barton
noreply at git.blender.org
Wed Jun 2 09:07:38 CEST 2021
Commit: 3b3742c75fb0960997cb28742c0879412004358d
Author: Campbell Barton
Date: Wed Jun 2 17:06:12 2021 +1000
Branches: master
https://developer.blender.org/rB3b3742c75fb0960997cb28742c0879412004358d
Cleanup: trailing commas to avoid right shift
This matches most declarations already in this file.
===================================================================
M source/blender/draw/intern/draw_cache_extract_mesh_extractors.c
===================================================================
diff --git a/source/blender/draw/intern/draw_cache_extract_mesh_extractors.c b/source/blender/draw/intern/draw_cache_extract_mesh_extractors.c
index 489974a79da..a806632c18d 100644
--- a/source/blender/draw/intern/draw_cache_extract_mesh_extractors.c
+++ b/source/blender/draw/intern/draw_cache_extract_mesh_extractors.c
@@ -242,13 +242,15 @@ static void extract_tris_finish(const MeshRenderData *mr,
MEM_freeN(data);
}
-const MeshExtract extract_tris = {.init = extract_tris_init,
- .iter_looptri_bm = extract_tris_iter_looptri_bm,
- .iter_looptri_mesh = extract_tris_iter_looptri_mesh,
- .finish = extract_tris_finish,
- .data_type = 0,
- .use_threading = false,
- .mesh_buffer_offset = offsetof(MeshBufferCache, ibo.tris)};
+const MeshExtract extract_tris = {
+ .init = extract_tris_init,
+ .iter_looptri_bm = extract_tris_iter_looptri_bm,
+ .iter_looptri_mesh = extract_tris_iter_looptri_mesh,
+ .finish = extract_tris_finish,
+ .data_type = 0,
+ .use_threading = false,
+ .mesh_buffer_offset = offsetof(MeshBufferCache, ibo.tris),
+};
/** \} */
@@ -369,15 +371,17 @@ static void extract_lines_finish(const MeshRenderData *UNUSED(mr),
MEM_freeN(elb);
}
-const MeshExtract extract_lines = {.init = extract_lines_init,
- .iter_poly_bm = extract_lines_iter_poly_bm,
- .iter_poly_mesh = extract_lines_iter_poly_mesh,
- .iter_ledge_bm = extract_lines_iter_ledge_bm,
- .iter_ledge_mesh = extract_lines_iter_ledge_mesh,
- .finish = extract_lines_finish,
- .data_type = 0,
- .use_threading = false,
- .mesh_buffer_offset = offsetof(MeshBufferCache, ibo.lines)};
+const MeshExtract extract_lines = {
+ .init = extract_lines_init,
+ .iter_poly_bm = extract_lines_iter_poly_bm,
+ .iter_poly_mesh = extract_lines_iter_poly_mesh,
+ .iter_ledge_bm = extract_lines_iter_ledge_bm,
+ .iter_ledge_mesh = extract_lines_iter_ledge_mesh,
+ .finish = extract_lines_finish,
+ .data_type = 0,
+ .use_threading = false,
+ .mesh_buffer_offset = offsetof(MeshBufferCache, ibo.lines),
+};
/** \} */
@@ -534,17 +538,19 @@ static void extract_points_finish(const MeshRenderData *UNUSED(mr),
MEM_freeN(elb);
}
-const MeshExtract extract_points = {.init = extract_points_init,
- .iter_poly_bm = extract_points_iter_poly_bm,
- .iter_poly_mesh = extract_points_iter_poly_mesh,
- .iter_ledge_bm = extract_points_iter_ledge_bm,
- .iter_ledge_mesh = extract_points_iter_ledge_mesh,
- .iter_lvert_bm = extract_points_iter_lvert_bm,
- .iter_lvert_mesh = extract_points_iter_lvert_mesh,
- .finish = extract_points_finish,
- .data_type = 0,
- .use_threading = false,
- .mesh_buffer_offset = offsetof(MeshBufferCache, ibo.points)};
+const MeshExtract extract_points = {
+ .init = extract_points_init,
+ .iter_poly_bm = extract_points_iter_poly_bm,
+ .iter_poly_mesh = extract_points_iter_poly_mesh,
+ .iter_ledge_bm = extract_points_iter_ledge_bm,
+ .iter_ledge_mesh = extract_points_iter_ledge_mesh,
+ .iter_lvert_bm = extract_points_iter_lvert_bm,
+ .iter_lvert_mesh = extract_points_iter_lvert_mesh,
+ .finish = extract_points_finish,
+ .data_type = 0,
+ .use_threading = false,
+ .mesh_buffer_offset = offsetof(MeshBufferCache, ibo.points),
+};
/** \} */
@@ -613,13 +619,15 @@ static void extract_fdots_finish(const MeshRenderData *UNUSED(mr),
MEM_freeN(elb);
}
-const MeshExtract extract_fdots = {.init = extract_fdots_init,
- .iter_poly_bm = extract_fdots_iter_poly_bm,
- .iter_poly_mesh = extract_fdots_iter_poly_mesh,
- .finish = extract_fdots_finish,
- .data_type = 0,
- .use_threading = false,
- .mesh_buffer_offset = offsetof(MeshBufferCache, ibo.fdots)};
+const MeshExtract extract_fdots = {
+ .init = extract_fdots_init,
+ .iter_poly_bm = extract_fdots_iter_poly_bm,
+ .iter_poly_mesh = extract_fdots_iter_poly_mesh,
+ .finish = extract_fdots_finish,
+ .data_type = 0,
+ .use_threading = false,
+ .mesh_buffer_offset = offsetof(MeshBufferCache, ibo.fdots),
+};
/** \} */
@@ -1354,17 +1362,19 @@ static void extract_pos_nor_finish(const MeshRenderData *UNUSED(mr),
MEM_freeN(data);
}
-const MeshExtract extract_pos_nor = {.init = extract_pos_nor_init,
- .iter_poly_bm = extract_pos_nor_iter_poly_bm,
- .iter_poly_mesh = extract_pos_nor_iter_poly_mesh,
- .iter_ledge_bm = extract_pos_nor_iter_ledge_bm,
- .iter_ledge_mesh = extract_pos_nor_iter_ledge_mesh,
- .iter_lvert_bm = extract_pos_nor_iter_lvert_bm,
- .iter_lvert_mesh = extract_pos_nor_iter_lvert_mesh,
- .finish = extract_pos_nor_finish,
- .data_type = 0,
- .use_threading = true,
- .mesh_buffer_offset = offsetof(MeshBufferCache, vbo.pos_nor)};
+const MeshExtract extract_pos_nor = {
+ .init = extract_pos_nor_init,
+ .iter_poly_bm = extract_pos_nor_iter_poly_bm,
+ .iter_poly_mesh = extract_pos_nor_iter_poly_mesh,
+ .iter_ledge_bm = extract_pos_nor_iter_ledge_bm,
+ .iter_ledge_mesh = extract_pos_nor_iter_ledge_mesh,
+ .iter_lvert_bm = extract_pos_nor_iter_lvert_bm,
+ .iter_lvert_mesh = extract_pos_nor_iter_lvert_mesh,
+ .finish = extract_pos_nor_finish,
+ .data_type = 0,
+ .use_threading = true,
+ .mesh_buffer_offset = offsetof(MeshBufferCache, vbo.pos_nor),
+};
/** \} */
@@ -1638,12 +1648,14 @@ static void extract_lnor_hq_iter_poly_mesh(const MeshRenderData *mr,
}
}
-const MeshExtract extract_lnor_hq = {.init = extract_lnor_hq_init,
- .iter_poly_bm = extract_lnor_hq_iter_poly_bm,
- .iter_poly_mesh = extract_lnor_hq_iter_poly_mesh,
- .data_type = MR_DATA_LOOP_NOR,
- .use_threading = true,
- .mesh_buffer_offset = offsetof(MeshBufferCache, vbo.lnor)};
+const MeshExtract extract_lnor_hq = {
+ .init = extract_lnor_hq_init,
+ .iter_poly_bm = extract_lnor_hq_iter_poly_bm,
+ .iter_poly_mesh = extract_lnor_hq_iter_poly_mesh,
+ .data_type = MR_DATA_LOOP_NOR,
+ .use_threading = true,
+ .mesh_buffer_offset = offsetof(MeshBufferCache, vbo.lnor),
+};
/** \} */
/* ---------------------------------------------------------------------- */
@@ -1727,12 +1739,14 @@ static void extract_lnor_iter_poly_mesh(const MeshRenderData *mr,
}
}
-const MeshExtract extract_lnor = {.init = extract_lnor_init,
- .iter_poly_bm = extract_lnor_iter_poly_bm,
- .iter_poly_mesh = extract_lnor_iter_poly_mesh,
- .data_type = MR_DATA_LOOP_NOR,
- .use_threading = true,
- .mesh_buffer_offset = offsetof(MeshBufferCache, vbo.lnor)};
+const MeshExtract extract_lnor = {
+ .init = extract_lnor_init,
+ .iter_poly_bm = extract_lnor_iter_poly_bm,
+ .iter_poly_mesh = extract_lnor_iter_poly_mesh,
+ .data_type = MR_DATA_LOOP_NOR,
+ .use_threading = true,
+ .mesh_buffer_offset = offsetof(MeshBufferCache, vbo.lnor),
+};
/** \} */
@@ -1824,10 +1838,12 @@ static void *extract_uv_init(const MeshRenderData *mr, struct MeshBatchCache *ca
return NULL;
}
-const MeshExtract extract_uv = {.init = extract_uv_init,
- .data_type = 0,
- .use_threading = false,
- .mesh_buffer_offset = offsetof(MeshBufferCache, vbo.uv)};
+const MeshExtract extract_uv = {
+ .init = extract_uv_init,
+ .data_type = 0,
+ .use_threading = false,
+ .mesh_buffer_offset = offsetof(MeshBufferCache, vbo.uv),
+};
/** \} */
@@ -2013,11 +2029,12 @@ static void *extract_tan_init(const MeshRenderData *mr, struct MeshBatchCache *c
return NULL;
}
-const MeshExtract extract_tan = {.init = extract_tan_init,
- .data_type = MR_DATA_POLY_NOR | MR_DATA_TAN_LOOP_NOR |
- MR_DATA_LOOPTRI,
- .use_threading = false,
- .mesh_buffer_offset = offsetof(MeshBufferCache, vbo.tan)};
+const MeshExtract extract_tan = {
+ .init = extract_tan_init,
+ .data_type = MR_DATA_POLY_NOR | MR_DATA_TAN_LOOP_NOR | MR_DATA_LOOPTRI,
+ .use_threading = false,
+ .mesh_buffer_offset = offsetof(MeshBufferCache, vbo.tan),
+};
/** \} */
@@ -2279,10 +2296,12 @@ static void *extract_vcol_init(const MeshRenderData *mr, struct MeshBatchCache *
return NULL;
}
-const MeshExtract extract_vcol = {.init = extract_vcol_init,
- .data_type = 0,
- .use_threading = false,
- .mesh_buffer_offset = offsetof(MeshBufferCache, vbo.vcol)};
+const MeshExtract extract_vcol = {
+ .init = extract_vcol_init,
+ .data_type = 0,
+ .use_threading
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list