diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-01 06:02:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-01 06:02:33 +0300 |
| commit | e4c9cf7088583353670e9783e0b0aecdf2a0c8df (patch) | |
| tree | a06c9fab7bcf8b51eac7986688ef9291b596f09f /source/blender/editors/uvedit | |
| parent | 7b27b10fa6a6a7c4286f30ba2c625896e7ba3fe6 (diff) | |
| parent | 10fec1f153295c9bd60eaa96dfcd09d8cf1b3d91 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/uvedit')
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_parametrizer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 03a5f4dddc8..479b43d50f0 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -1704,7 +1704,7 @@ static int uv_remove_doubles_exec(bContext *C, wmOperator *op) float uv_min[2]; float uv_max[2]; - BLI_array_empty(loop_arr); + BLI_array_clear(loop_arr); BLI_array_append(loop_arr, vert_arr[uv_a_index].uv_loop); uv_a = vert_arr[uv_a_index].uv_loop->uv; diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index 29c908ff900..2a3a2b84223 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -2185,7 +2185,7 @@ static void p_chart_simplify_compute(PChart *chart) e->u.nextcollapse = NULL; /* pop edge collapse out of heap one by one */ - while (!BLI_heap_empty(heap)) { + while (!BLI_heap_is_empty(heap)) { if (ncollapsed == NCOLLAPSE) break; |