diff options
Diffstat (limited to 'source/blender/draw/intern/mesh_extractors')
29 files changed, 45 insertions, 45 deletions
diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh.c b/source/blender/draw/intern/mesh_extractors/extract_mesh.c index 53827dcc7d9..44de07c8594 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh.c +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh.c @@ -33,11 +33,11 @@ #include "draw_cache_impl.h" -void *mesh_extract_buffer_get(const MeshExtract *extractor, MeshBufferCache *mbc) +void *mesh_extract_buffer_get(const MeshExtract *extractor, MeshBufferList *mbuflist) { /* NOTE: POINTER_OFFSET on windows platforms casts internally to `void *`, but on GCC/CLANG to - * `MeshBufferCache *`. What shows a different usage versus intent. */ - void **buffer_ptr = (void **)POINTER_OFFSET(mbc, extractor->mesh_buffer_offset); + * `MeshBufferList *`. What shows a different usage versus intent. */ + void **buffer_ptr = (void **)POINTER_OFFSET(mbuflist, extractor->mesh_buffer_offset); void *buffer = *buffer_ptr; BLI_assert(buffer); return buffer; diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh.h b/source/blender/draw/intern/mesh_extractors/extract_mesh.h index f24ccf1a028..acf73ec9b1b 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh.h +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh.h @@ -232,7 +232,7 @@ typedef struct MeshExtract { /** Used to know if the element callbacks are thread-safe and can be parallelized. */ bool use_threading; /** - * Offset in bytes of the buffer inside a MeshBufferCache instance. Points to a vertex or index + * Offset in bytes of the buffer inside a MeshBufferList instance. Points to a vertex or index * buffer. */ size_t mesh_buffer_offset; @@ -270,7 +270,7 @@ typedef struct EditLoopData { uchar bweight; } EditLoopData; -void *mesh_extract_buffer_get(const MeshExtract *extractor, MeshBufferCache *mbc); +void *mesh_extract_buffer_get(const MeshExtract *extractor, MeshBufferList *mbuflist); eMRIterType mesh_extract_iter_type(const MeshExtract *ext); const MeshExtract *mesh_extract_override_get(const MeshExtract *extractor, const bool do_hq_normals, diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc index 5bd5f7adaa8..d06fb91411e 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc @@ -104,7 +104,7 @@ constexpr MeshExtract create_extractor_edituv_tris() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(MeshExtract_EditUvElem_Data); extractor.use_threading = false; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, ibo.edituv_tris); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, ibo.edituv_tris); return extractor; } @@ -194,7 +194,7 @@ constexpr MeshExtract create_extractor_edituv_lines() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(MeshExtract_EditUvElem_Data); extractor.use_threading = false; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, ibo.edituv_lines); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, ibo.edituv_lines); return extractor; } @@ -278,7 +278,7 @@ constexpr MeshExtract create_extractor_edituv_points() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(MeshExtract_EditUvElem_Data); extractor.use_threading = false; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, ibo.edituv_points); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, ibo.edituv_points); return extractor; } @@ -374,7 +374,7 @@ constexpr MeshExtract create_extractor_edituv_fdots() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(MeshExtract_EditUvElem_Data); extractor.use_threading = false; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, ibo.edituv_fdots); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, ibo.edituv_fdots); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc index 0f41702a22c..ea58e1aeed8 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc @@ -105,7 +105,7 @@ constexpr MeshExtract create_extractor_fdots() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(GPUIndexBufBuilder); extractor.use_threading = false; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, ibo.fdots); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, ibo.fdots); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc index 0096da9e56f..f148267f8f5 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc @@ -168,7 +168,7 @@ constexpr MeshExtract create_extractor_lines() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(GPUIndexBufBuilder); extractor.use_threading = true; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, ibo.lines); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, ibo.lines); return extractor; } @@ -213,7 +213,7 @@ constexpr MeshExtract create_extractor_lines_with_lines_loose() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(GPUIndexBufBuilder); extractor.use_threading = true; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, ibo.lines); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, ibo.lines); return extractor; } @@ -240,7 +240,7 @@ constexpr MeshExtract create_extractor_lines_loose_only() extractor.data_type = MR_DATA_LOOSE_GEOM; extractor.data_size = 0; extractor.use_threading = false; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, ibo.lines_loose); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, ibo.lines_loose); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc index 7a37cf50264..522afcd44a1 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc @@ -185,7 +185,7 @@ constexpr MeshExtract create_extractor_lines_adjacency() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(MeshExtract_LineAdjacency_Data); extractor.use_threading = false; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, ibo.lines_adjacency); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, ibo.lines_adjacency); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc index 5def7edb75a..494a43e97d1 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc @@ -114,7 +114,7 @@ constexpr MeshExtract create_extractor_lines_paint_mask() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(MeshExtract_LinePaintMask_Data); extractor.use_threading = false; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, ibo.lines_paint_mask); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, ibo.lines_paint_mask); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc index cc1a19b8d26..b801ba04162 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc @@ -169,7 +169,7 @@ constexpr MeshExtract create_extractor_points() extractor.use_threading = true; extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(GPUIndexBufBuilder); - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, ibo.points); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, ibo.points); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc index 264cef16223..54e733d3d86 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc @@ -134,7 +134,7 @@ constexpr MeshExtract create_extractor_tris() extractor.data_type = MR_DATA_LOOPTRI | MR_DATA_POLYS_SORTED; extractor.data_size = sizeof(GPUIndexBufBuilder); extractor.use_threading = true; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, ibo.tris); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, ibo.tris); return extractor; } @@ -221,7 +221,7 @@ constexpr MeshExtract create_extractor_tris_single_mat() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(GPUIndexBufBuilder); extractor.use_threading = true; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, ibo.tris); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, ibo.tris); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edge_fac.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edge_fac.cc index 302616d4da9..2e2444a8e3d 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edge_fac.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edge_fac.cc @@ -228,7 +228,7 @@ constexpr MeshExtract create_extractor_edge_fac() extractor.data_type = MR_DATA_POLY_NOR; extractor.data_size = sizeof(MeshExtract_EdgeFac_Data); extractor.use_threading = false; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.edge_fac); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.edge_fac); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edit_data.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edit_data.cc index a7efb9c8a1b..5232346e51e 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edit_data.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edit_data.cc @@ -253,7 +253,7 @@ constexpr MeshExtract create_extractor_edit_data() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(EditLoopData *); extractor.use_threading = true; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.edit_data); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.edit_data); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_data.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_data.cc index 0378aadabd0..b8494428eed 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_data.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_data.cc @@ -128,7 +128,7 @@ constexpr MeshExtract create_extractor_edituv_data() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(MeshExtract_EditUVData_Data); extractor.use_threading = true; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.edituv_data); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.edituv_data); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc index a60c0182e89..a947d98f955 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc @@ -222,7 +222,7 @@ constexpr MeshExtract create_extractor_edituv_edituv_stretch_angle() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(MeshExtract_StretchAngle_Data); extractor.use_threading = false; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.edituv_stretch_angle); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.edituv_stretch_angle); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc index d79ac493c33..3db8cd79af5 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc @@ -143,7 +143,7 @@ constexpr MeshExtract create_extractor_edituv_stretch_area() extractor.data_type = MR_DATA_NONE; extractor.data_size = 0; extractor.use_threading = false; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.edituv_stretch_area); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.edituv_stretch_area); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_edituv_data.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_edituv_data.cc index b7182d1b60f..28592417183 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_edituv_data.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_edituv_data.cc @@ -89,7 +89,7 @@ constexpr MeshExtract create_extractor_fdots_edituv_data() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(MeshExtract_EditUVFdotData_Data); extractor.use_threading = true; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.fdots_edituv_data); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.fdots_edituv_data); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_nor.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_nor.cc index 5e4ad54f7b6..fed66f0057d 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_nor.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_nor.cc @@ -105,7 +105,7 @@ constexpr MeshExtract create_extractor_fdots_nor() extractor.data_type = MR_DATA_LOOP_NOR; extractor.data_size = 0; extractor.use_threading = false; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.fdots_nor); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.fdots_nor); return extractor; } @@ -186,7 +186,7 @@ constexpr MeshExtract create_extractor_fdots_nor_hq() extractor.data_type = MR_DATA_LOOP_NOR; extractor.data_size = 0; extractor.use_threading = false; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.fdots_nor); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.fdots_nor); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_pos.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_pos.cc index e765fb8a8bf..33f9180e122 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_pos.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_pos.cc @@ -106,7 +106,7 @@ constexpr MeshExtract create_extractor_fdots_pos() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(float(*)[3]); extractor.use_threading = true; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.fdots_pos); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.fdots_pos); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_uv.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_uv.cc index 042a0d2debe..6fe714def30 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_uv.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_uv.cc @@ -114,7 +114,7 @@ constexpr MeshExtract create_extractor_fdots_uv() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(MeshExtract_FdotUV_Data); extractor.use_threading = true; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.fdots_uv); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.fdots_uv); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_lnor.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_lnor.cc index 8344a615cbe..f9f66c27aaa 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_lnor.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_lnor.cc @@ -116,7 +116,7 @@ constexpr MeshExtract create_extractor_lnor() extractor.data_type = MR_DATA_LOOP_NOR; extractor.data_size = sizeof(GPUPackedNormal *); extractor.use_threading = true; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.lnor); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.lnor); return extractor; } @@ -214,7 +214,7 @@ constexpr MeshExtract create_extractor_lnor_hq() extractor.data_type = MR_DATA_LOOP_NOR; extractor.data_size = sizeof(gpuHQNor *); extractor.use_threading = true; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.lnor); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.lnor); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc index 075d54e268e..33a33c81bc2 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc @@ -641,7 +641,7 @@ constexpr MeshExtract create_extractor_mesh_analysis() extractor.data_type = MR_DATA_POLY_NOR | MR_DATA_LOOPTRI; extractor.data_size = 0; extractor.use_threading = false; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.mesh_analysis); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.mesh_analysis); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_orco.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_orco.cc index 269c0343e32..c5187a47892 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_orco.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_orco.cc @@ -102,7 +102,7 @@ constexpr MeshExtract create_extractor_orco() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(MeshExtract_Orco_Data); extractor.use_threading = true; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.orco); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.orco); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc index b8e5dcb613f..eb9a138590c 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc @@ -208,7 +208,7 @@ constexpr MeshExtract create_extractor_pos_nor() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(MeshExtract_PosNor_Data); extractor.use_threading = true; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.pos_nor); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.pos_nor); return extractor; } @@ -401,7 +401,7 @@ constexpr MeshExtract create_extractor_pos_nor_hq() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(MeshExtract_PosNorHQ_Data); extractor.use_threading = true; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.pos_nor); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.pos_nor); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc index dbb1e1f880b..fd91bc5258f 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc @@ -128,7 +128,7 @@ constexpr MeshExtract create_extractor_sculpt_data() extractor.data_type = MR_DATA_NONE; extractor.data_size = 0; extractor.use_threading = false; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.sculpt_data); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.sculpt_data); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_select_idx.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_select_idx.cc index cd8d46901c5..5ac30dd3be9 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_select_idx.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_select_idx.cc @@ -205,7 +205,7 @@ constexpr MeshExtract create_extractor_poly_idx() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(uint32_t *); extractor.use_threading = true; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.poly_idx); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.poly_idx); return extractor; } @@ -220,7 +220,7 @@ constexpr MeshExtract create_extractor_edge_idx() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(uint32_t *); extractor.use_threading = true; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.edge_idx); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.edge_idx); return extractor; } @@ -237,7 +237,7 @@ constexpr MeshExtract create_extractor_vert_idx() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(uint32_t *); extractor.use_threading = true; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.vert_idx); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.vert_idx); return extractor; } @@ -279,7 +279,7 @@ constexpr MeshExtract create_extractor_fdot_idx() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(uint32_t *); extractor.use_threading = true; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.fdot_idx); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.fdot_idx); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_skin_roots.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_skin_roots.cc index ffca01d00dd..1847a360837 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_skin_roots.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_skin_roots.cc @@ -80,7 +80,7 @@ constexpr MeshExtract create_extractor_skin_roots() extractor.data_type = MR_DATA_NONE; extractor.data_size = 0; extractor.use_threading = false; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.skin_roots); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.skin_roots); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_tan.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_tan.cc index 8f36bfdf1ef..1f8776fc98e 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_tan.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_tan.cc @@ -226,7 +226,7 @@ constexpr MeshExtract create_extractor_tan() extractor.data_type = MR_DATA_POLY_NOR | MR_DATA_TAN_LOOP_NOR | MR_DATA_LOOPTRI; extractor.data_size = 0; extractor.use_threading = false; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.tan); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.tan); return extractor; } @@ -252,7 +252,7 @@ constexpr MeshExtract create_extractor_tan_hq() extractor.data_type = MR_DATA_POLY_NOR | MR_DATA_TAN_LOOP_NOR | MR_DATA_LOOPTRI; extractor.data_size = 0; extractor.use_threading = false; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.tan); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.tan); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc index 013da7d674a..af279b08a59 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc @@ -123,7 +123,7 @@ constexpr MeshExtract create_extractor_uv() extractor.data_type = MR_DATA_NONE; extractor.data_size = 0; extractor.use_threading = false; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.uv); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.uv); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_vcol.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_vcol.cc index d810acfb617..2c7770c8e72 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_vcol.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_vcol.cc @@ -178,7 +178,7 @@ constexpr MeshExtract create_extractor_vcol() extractor.data_type = MR_DATA_NONE; extractor.data_size = 0; extractor.use_threading = false; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.vcol); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.vcol); return extractor; } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_weights.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_weights.cc index c547a453aeb..bdb1410a755 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_weights.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_weights.cc @@ -176,7 +176,7 @@ constexpr MeshExtract create_extractor_weights() extractor.data_type = MR_DATA_NONE; extractor.data_size = sizeof(MeshExtract_Weight_Data); extractor.use_threading = true; - extractor.mesh_buffer_offset = offsetof(MeshBufferCache, vbo.weights); + extractor.mesh_buffer_offset = offsetof(MeshBufferList, vbo.weights); return extractor; } |