[Bf-blender-cvs] [74d716ce23a] master: Fix error/crash in hidden edge drawing after recent changes
Brecht Van Lommel
noreply at git.blender.org
Tue Aug 16 18:09:59 CEST 2022
Commit: 74d716ce23a64ed23b85e9c7a98f153f33dac952
Author: Brecht Van Lommel
Date: Tue Aug 16 17:58:48 2022 +0200
Branches: master
https://developer.blender.org/rB74d716ce23a64ed23b85e9c7a98f153f33dac952
Fix error/crash in hidden edge drawing after recent changes
Mistake in 2480b55 using the wrong array.
===================================================================
M source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc
===================================================================
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 fe883fb0c96..6d989c3fe03 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
@@ -183,10 +183,10 @@ static void extract_lines_loose_geom_subdiv(const DRWSubdivCache *subdiv_cache,
switch (mr->extract_type) {
case MR_EXTRACT_MESH: {
- const bool *hide_vert = mr->hide_vert;
- if (hide_vert) {
+ const bool *hide_edge = mr->hide_edge;
+ if (hide_edge) {
for (DRWSubdivLooseEdge edge : loose_edges) {
- *flags_data++ = hide_vert[edge.coarse_edge_index];
+ *flags_data++ = hide_edge[edge.coarse_edge_index];
}
}
else {
@@ -202,13 +202,13 @@ static void extract_lines_loose_geom_subdiv(const DRWSubdivCache *subdiv_cache,
}
}
else {
- const bool *hide_vert = mr->hide_vert;
- if (hide_vert) {
+ const bool *hide_edge = mr->hide_edge;
+ if (hide_edge) {
for (DRWSubdivLooseEdge edge : loose_edges) {
int e = edge.coarse_edge_index;
if (mr->e_origindex && mr->e_origindex[e] != ORIGINDEX_NONE) {
- *flags_data++ = hide_vert[edge.coarse_edge_index];
+ *flags_data++ = hide_edge[edge.coarse_edge_index];
}
else {
*flags_data++ = false;
More information about the Bf-blender-cvs
mailing list