Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-05-22 08:26:45 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-05-22 08:28:14 +0300
commit67cf4cb5ec1e0f964fe41fa6aae80ffceedbf939 (patch)
treeabf9d1269fefe0fc110debd58710276424db3ebf /source/blender/editors/mesh
parentfeabab6a9e9bfd303d8784938b34e3f89375bebb (diff)
Cleanup: replace MEM_SAFE_FREE -> MEM_freeN
No need to check for NULL in this case.
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r--source/blender/editors/mesh/editmesh_select.c14
-rw-r--r--source/blender/editors/mesh/editmesh_tools.c6
2 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c
index 41a0fa9ce38..11f87b3710d 100644
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@ -1926,7 +1926,7 @@ static int edbm_select_all_exec(bContext *C, wmOperator *op)
WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
}
- MEM_SAFE_FREE(objects);
+ MEM_freeN(objects);
return OPERATOR_FINISHED;
}
@@ -2028,7 +2028,7 @@ bool EDBM_select_pick(bContext *C, const int mval[2], bool extend, bool deselect
WM_event_add_notifier(C, NC_GEOM | ND_SELECT, ob_iter->data);
}
}
- MEM_SAFE_FREE(objects);
+ MEM_freeN(objects);
}
if (efa) {
@@ -2429,7 +2429,7 @@ bool EDBM_selectmode_toggle(
}
if (only_update) {
- MEM_SAFE_FREE(objects);
+ MEM_freeN(objects);
return false;
}
@@ -2482,7 +2482,7 @@ bool EDBM_selectmode_toggle(
DEG_id_tag_update(&scene->id, DEG_TAG_COPY_ON_WRITE);
}
- MEM_SAFE_FREE(objects);
+ MEM_freeN(objects);
return ret;
}
@@ -2929,7 +2929,7 @@ static int edbm_select_linked_exec(bContext *C, wmOperator *op)
}
- MEM_SAFE_FREE(objects);
+ MEM_freeN(objects);
return OPERATOR_FINISHED;
}
@@ -3101,7 +3101,7 @@ static int edbm_select_linked_pick_invoke(bContext *C, wmOperator *op, const wmE
has_edges = true;
}
}
- MEM_SAFE_FREE(objects);
+ MEM_freeN(objects);
if (has_edges == false) {
return OPERATOR_CANCELLED;
}
@@ -3763,7 +3763,7 @@ static int edbm_select_nth_exec(bContext *C, wmOperator *op)
EDBM_update_generic(em, false, false);
}
}
- MEM_SAFE_FREE(objects);
+ MEM_freeN(objects);
if (!found_active_elt) {
BKE_report(op->reports, RPT_ERROR,
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 0c13c900dee..8c6e7fed49b 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -131,7 +131,7 @@ static int edbm_subdivide_exec(bContext *C, wmOperator *op)
EDBM_update_generic(em, true, true);
}
- MEM_SAFE_FREE(objects);
+ MEM_freeN(objects);
return OPERATOR_FINISHED;
}
@@ -478,7 +478,7 @@ static int edbm_delete_exec(bContext *C, wmOperator *op)
EDBM_update_generic(em, true, true);
}
- MEM_SAFE_FREE(objects);
+ MEM_freeN(objects);
return changed_multi ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
}
@@ -603,7 +603,7 @@ static int edbm_delete_loose_exec(bContext *C, wmOperator *op)
edbm_report_delete_info(op->reports, totelem_old, totelem_new);
- MEM_SAFE_FREE(objects);
+ MEM_freeN(objects);
return OPERATOR_FINISHED;
}