blender
/
blender
130
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Draw: make 'ibo.lines_loose' extracting safer 

No functional changes.
This commit is contained in:
Germano Cavalcante 2021-06-28 10:59:40 -03:00
parent 413bd71aaf
commit 8de878e202
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/draw/intern/draw_cache_extract_mesh.cc
View File

@ -649,10 +649,20 @@ static void mesh_buffer_cache_create_requested(struct TaskGraph *task_graph,
EXTRACT_ADD_REQUESTED(vbo, skin_roots);
EXTRACT_ADD_REQUESTED(ibo, tris);
if (DRW_ibo_requested(mbc->ibo.lines)) {
if (DRW_ibo_requested(mbc->ibo.lines_loose)) {
/* `ibo.lines_loose` require the `ibo.lines` buffer. */
if (mbc->ibo.lines == nullptr) {
DRW_ibo_request(nullptr, &mbc->ibo.lines);
}
const MeshExtract *extractor = DRW_ibo_requested(mbc->ibo.lines) ?
&extract_lines_with_lines_loose :
&extract_lines_loose_only;
extractors.append(extractor);
}
else if (DRW_ibo_requested(mbc->ibo.lines)) {
const MeshExtract *extractor;
if (mbc->ibo.lines_loose != nullptr) {
/* Update #lines_loose ibo. */
/* Update `ibo.lines_loose` as it depends on `ibo.lines`. */
extractor = &extract_lines_with_lines_loose;
}
else {
@ -660,11 +670,6 @@ static void mesh_buffer_cache_create_requested(struct TaskGraph *task_graph,
}
extractors.append(extractor);
}
else if (DRW_ibo_requested(mbc->ibo.lines_loose)) {
/* Note: #ibo.lines must have been created first. */
const MeshExtract *extractor = &extract_lines_loose_only;
extractors.append(extractor);
}
EXTRACT_ADD_REQUESTED(ibo, points);
EXTRACT_ADD_REQUESTED(ibo, fdots);
EXTRACT_ADD_REQUESTED(ibo, lines_paint_mask);