diff options
| author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2022-05-27 12:03:56 +0300 |
|---|---|---|
| committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2022-05-27 12:03:56 +0300 |
| commit | 84189a63400a1c8950c8363a7af5a4525f7e94c9 (patch) | |
| tree | 89519f96c5bc69dd663042713d044d93dc1517bc /source/blender/draw/intern/mesh_extractors | |
| parent | f41c7723c93bc9e784634887da8b682787729538 (diff) | |
| parent | 5625a21fc7cf3738278f02038cb6d8a3c2344584 (diff) | |
Merge remote-tracking branch 'origin/blender-v3.2-release'
Diffstat (limited to 'source/blender/draw/intern/mesh_extractors')
| -rw-r--r-- | source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_pos.cc | 7 | ||||
| -rw-r--r-- | source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_vcol.cc | 4 |
2 files changed, 6 insertions, 5 deletions
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 c2b4d389b7c..1671a1cd1e7 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 @@ -110,8 +110,11 @@ static void extract_fdots_init_subdiv(const DRWSubdivCache *subdiv_cache, GPUVertBuf *fdots_nor_vbo = cache->final.buff.vbo.fdots_nor; GPUIndexBuf *fdots_pos_ibo = cache->final.buff.ibo.fdots; - GPU_vertbuf_init_build_on_device( - fdots_nor_vbo, get_fdots_nor_format_subdiv(), subdiv_cache->num_coarse_poly); + /* The normals may not be requested. */ + if (fdots_nor_vbo) { + GPU_vertbuf_init_build_on_device( + fdots_nor_vbo, get_fdots_nor_format_subdiv(), subdiv_cache->num_coarse_poly); + } GPU_vertbuf_init_build_on_device( fdots_pos_vbo, get_fdots_pos_format(), subdiv_cache->num_coarse_poly); GPU_indexbuf_init_build_on_device(fdots_pos_ibo, subdiv_cache->num_coarse_poly); 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 e5dd025787d..fa5bf35198b 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 @@ -271,8 +271,6 @@ static void extract_vcol_init_subdiv(const DRWSubdivCache *subdiv_cache, blender::Vector<VColRef> refs = get_vcol_refs(cd_vdata, cd_ldata, vcol_layers); - gpuMeshVcol *vcol = mesh_vcol; - /* Index of the vertex color layer in the compact buffer. Used vertex color layers are stored in * a single buffer. */ int pack_layer_index = 0; @@ -287,10 +285,10 @@ static void extract_vcol_init_subdiv(const DRWSubdivCache *subdiv_cache, if (layer_i == -1) { printf("%s: missing color layer %s\n", __func__, ref.layer->name); - vcol += coarse_mesh->totloop; continue; } + gpuMeshVcol *vcol = mesh_vcol; MLoopCol *mcol = nullptr; MPropCol *pcol = nullptr; |