diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-04-01 11:57:33 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-01 11:57:33 +0400 |
commit | c7e2a31bf25b33d9b579860576a473dba8461eb2 (patch) | |
tree | 88e75ca84e97b9c61b490506f4ad747366583eb1 /source/blender | |
parent | 5e02acf8872996e90815606425862aeabe2012b8 (diff) |
correct too-big allocation in mesh beautify.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/bmesh/operators/bmo_beautify.c | 4 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_stroke.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/bmesh/operators/bmo_beautify.c b/source/blender/bmesh/operators/bmo_beautify.c index 3e968f9250d..68d0c662b2c 100644 --- a/source/blender/bmesh/operators/bmo_beautify.c +++ b/source/blender/bmesh/operators/bmo_beautify.c @@ -33,8 +33,6 @@ * * TODO * - Take face normals into account. - * - Use a stack of rotations to perform the best onces first - * similar to edge-collapse-decimate. */ #include "BLI_math.h" @@ -305,7 +303,7 @@ static void bm_mesh_beautify_fill(BMesh *bm, BMEdge **edge_array, const int edge #endif eheap = BLI_heap_new_ex(edge_array_len); - eheap_table = MEM_mallocN(sizeof(HeapNode *) * bm->totedge, __func__); + eheap_table = MEM_mallocN(sizeof(HeapNode *) * edge_array_len, __func__); /* build heap */ for (i = 0; i < edge_array_len; i++) { diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index d5ece4830af..1c0830a8158 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -185,7 +185,7 @@ static void paint_brush_update(bContext *C, Brush *brush, PaintMode mode, ups->brush_rotation = 0.0f; } - if ((brush->mtex.brush_map_mode == MTEX_MAP_MODE_RANDOM)) + if (brush->mtex.brush_map_mode == MTEX_MAP_MODE_RANDOM) BKE_brush_randomize_texture_coordinates(ups); else copy_v2_v2(ups->tex_mouse, mouse); |