diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-27 16:49:59 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-27 16:49:59 +0300 |
| commit | 58adc586612e695d04033f2029362f279a9c05a4 (patch) | |
| tree | 0ebe8d1958f179e54a07eb44456002d46816a593 /source/blender/editors/mesh/editmesh_rip.c | |
| parent | 0f6b2504f80edddc76c104e9df0722fbb7d484a7 (diff) | |
| parent | a247b53084760498ca81eb6bdb901dee8f3a02ca (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/mesh/editmesh_rip.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_rip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index 794111fd6ae..9d6c0267cc2 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -1016,7 +1016,7 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, const wmEvent *event) bool no_vertex_selected = true; bool error_face_selected = true; - bool error_disconected_vertices = true; + bool error_disconnected_vertices = true; bool error_rip_failed = true; for (uint ob_index = 0; ob_index < objects_len; ob_index++) { @@ -1047,7 +1047,7 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, const wmEvent *event) if ((bm->totvertsel > 1) && (bm->totedgesel == 0)) { continue; } - error_disconected_vertices = false; + error_disconnected_vertices = false; /* note on selection: * When calling edge split we operate on tagged edges rather then selected @@ -1096,7 +1096,7 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, const wmEvent *event) BKE_report(op->reports, RPT_ERROR, "Cannot rip selected faces"); return OPERATOR_CANCELLED; } - else if (error_disconected_vertices) { + else if (error_disconnected_vertices) { BKE_report(op->reports, RPT_ERROR, "Cannot rip multiple disconnected vertices"); return OPERATOR_CANCELLED; } |