diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-06-27 05:10:19 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-06-27 05:10:19 +0400 |
commit | bb42703ea34e539e441dd90f5cbba16599e91506 (patch) | |
tree | 1af46e3f9ff573dcf049e9a371b19b938f6ff613 /source/blender | |
parent | 46808dd22c046d8ce1def1a52175c8be15e217b3 (diff) |
- remove edge collapse loop operator (now replaced by dissolve).
- fix missing null pointer check from own recent changes.
- add asserts if BLI path functions are given wrong id's
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenlib/intern/path_util.c | 5 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_select.c | 22 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 28 | ||||
-rw-r--r-- | source/blender/editors/mesh/mesh_intern.h | 1 | ||||
-rw-r--r-- | source/blender/editors/mesh/mesh_ops.c | 1 |
5 files changed, 17 insertions, 40 deletions
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 1f96c10e712..fe50c2abcc1 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -1222,6 +1222,9 @@ const char *BLI_get_folder(int folder_id, const char *subfolder) if (get_path_local(path, "python", subfolder, ver)) break; if (get_path_system(path, "python", subfolder, "BLENDER_SYSTEM_PYTHON", ver)) break; return NULL; + + default: + BLI_assert(0); } return path; @@ -1248,6 +1251,8 @@ const char *BLI_get_user_folder_notest(int folder_id, const char *subfolder) case BLENDER_USER_SCRIPTS: get_path_user(path, "scripts", subfolder, "BLENDER_USER_SCRIPTS", ver); break; + default: + BLI_assert(0); } if ('\0' == path[0]) { return NULL; diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index df5d764d69b..89981bce12d 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -2392,16 +2392,18 @@ static void deselect_nth_active(BMEditMesh *em, BMVert **r_eve, BMEdge **r_eed, EDBM_selectmode_flush(em); ele = BM_mesh_active_elem_get(em->bm); - switch (ele->head.htype) { - case BM_VERT: - *r_eve = (BMVert *)ele; - return; - case BM_EDGE: - *r_eed = (BMEdge *)ele; - return; - case BM_FACE: - *r_efa = (BMFace *)ele; - return; + if (ele) { + switch (ele->head.htype) { + case BM_VERT: + *r_eve = (BMVert *)ele; + return; + case BM_EDGE: + *r_eed = (BMEdge *)ele; + return; + case BM_FACE: + *r_efa = (BMFace *)ele; + return; + } } if (em->selectmode & SCE_SELECT_VERTEX) { diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 51d02e8cc2b..0d0134af4e5 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -407,34 +407,6 @@ void MESH_OT_edge_collapse(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } -static int edbm_collapse_edge_loop_exec(bContext *C, wmOperator *op) -{ - Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BKE_editmesh_from_object(obedit); - - if (!EDBM_op_callf(em, op, "dissolve_edge_loop edges=%he", BM_ELEM_SELECT)) - return OPERATOR_CANCELLED; - - EDBM_update_generic(em, true, true); - - return OPERATOR_FINISHED; -} - -void MESH_OT_edge_collapse_loop(wmOperatorType *ot) -{ - /* identifiers */ - ot->name = "Edge Collapse Loop"; - ot->description = "Collapse selected edge loops"; - ot->idname = "MESH_OT_edge_collapse_loop"; - - /* api callbacks */ - ot->exec = edbm_collapse_edge_loop_exec; - ot->poll = ED_operator_editmesh; - - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; -} - static int edbm_add_edge_face__smooth_get(BMesh *bm) { BMEdge *e; diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h index e086e11e3bf..69f471670ed 100644 --- a/source/blender/editors/mesh/mesh_intern.h +++ b/source/blender/editors/mesh/mesh_intern.h @@ -180,7 +180,6 @@ void MESH_OT_colors_rotate(struct wmOperatorType *ot); void MESH_OT_colors_reverse(struct wmOperatorType *ot); void MESH_OT_delete(struct wmOperatorType *ot); void MESH_OT_edge_collapse(struct wmOperatorType *ot); -void MESH_OT_edge_collapse_loop(struct wmOperatorType *ot); void MESH_OT_faces_shade_smooth(struct wmOperatorType *ot); void MESH_OT_faces_shade_flat(struct wmOperatorType *ot); void MESH_OT_split(struct wmOperatorType *ot); diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index c97b674dd2d..4f2924293ea 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -119,7 +119,6 @@ void ED_operatortypes_mesh(void) WM_operatortype_append(MESH_OT_delete); WM_operatortype_append(MESH_OT_edge_collapse); - WM_operatortype_append(MESH_OT_edge_collapse_loop); WM_operatortype_append(MESH_OT_separate); WM_operatortype_append(MESH_OT_dupli_extrude_cursor); |