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

Fix crash in dynamic mesh preview edge list update 

Reviewed By: jbakker

Differential Revision: https://developer.blender.org/D5824
This commit is contained in:
Pablo Dobarro 2019-09-23 18:07:28 +02:00
parent 0dd83b385e
commit a7904dff4b
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/blender/editors/sculpt_paint/sculpt.c
View File

@ -9116,9 +9116,11 @@ void sculpt_geometry_preview_lines_update(bContext *C, SculptSession *ss, float
char *visited_vertices = MEM_callocN(sculpt_vertex_count_get(ss) * sizeof(char),
"visited vertices");
/* Assuming an average of 6 edges per vertex in a triangulated mesh */
const int max_preview_vertices = sculpt_vertex_count_get(ss) * 3 * 2;
if (ss->preview_vert_index_list == NULL) {
ss->preview_vert_index_list = MEM_callocN(4 * sizeof(int) * sculpt_vertex_count_get(ss),
"preview lines");
ss->preview_vert_index_list = MEM_callocN(max_preview_vertices * sizeof(int), "preview lines");
}
BLI_Stack *not_visited_vertices = BLI_stack_new(sizeof(VertexTopologyIterator),
@ -9133,17 +9135,20 @@ void sculpt_geometry_preview_lines_update(bContext *C, SculptSession *ss, float
SculptVertexNeighborIter ni;
sculpt_vertex_neighbors_iter_begin(ss, c_mevit.v, ni)
{
VertexTopologyIterator new_entry;
new_entry.v = ni.index;
new_entry.it = c_mevit.it + 1;
ss->preview_vert_index_list[totpoints] = c_mevit.v;
totpoints++;
ss->preview_vert_index_list[totpoints] = new_entry.v;
totpoints++;
if (visited_vertices[(int)ni.index] == 0) {
visited_vertices[(int)ni.index] = 1;
if (len_squared_v3v3(brush_co, sculpt_vertex_co_get(ss, new_entry.v)) < radius * radius) {
BLI_stack_push(not_visited_vertices, &new_entry);
if (totpoints + (ni.size * 2) < max_preview_vertices) {
VertexTopologyIterator new_entry;
new_entry.v = ni.index;
new_entry.it = c_mevit.it + 1;
ss->preview_vert_index_list[totpoints] = c_mevit.v;
totpoints++;
ss->preview_vert_index_list[totpoints] = new_entry.v;
totpoints++;
if (visited_vertices[(int)ni.index] == 0) {
visited_vertices[(int)ni.index] = 1;
if (len_squared_v3v3(brush_co, sculpt_vertex_co_get(ss, new_entry.v)) <
radius * radius) {
BLI_stack_push(not_visited_vertices, &new_entry);
}
}
}
}