diff options
Diffstat (limited to 'source/blender/editors/mesh/editmesh_extrude_screw.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_extrude_screw.c | 139 |
1 files changed, 85 insertions, 54 deletions
diff --git a/source/blender/editors/mesh/editmesh_extrude_screw.c b/source/blender/editors/mesh/editmesh_extrude_screw.c index ffbbae60949..3214f28412a 100644 --- a/source/blender/editors/mesh/editmesh_extrude_screw.c +++ b/source/blender/editors/mesh/editmesh_extrude_screw.c @@ -25,17 +25,20 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/editors/mesh/editmesh_extrude_spin.c +/** \file blender/editors/mesh/editmesh_extrude_screw.c * \ingroup edmesh */ +#include "MEM_guardedalloc.h" + #include "DNA_object_types.h" #include "BLI_math.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" +#include "BKE_layer.h" +#include "BKE_report.h" #include "RNA_define.h" #include "RNA_access.h" @@ -46,6 +49,8 @@ #include "ED_screen.h" #include "ED_view3d.h" + + #include "mesh_intern.h" /* own include */ /* -------------------------------------------------------------------- */ @@ -54,84 +59,110 @@ static int edbm_screw_exec(bContext *C, wmOperator *op) { - Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BKE_editmesh_from_object(obedit); - BMesh *bm = em->bm; BMEdge *eed; BMVert *eve, *v1, *v2; BMIter iter, eiter; - BMOperator spinop; float dvec[3], nor[3], cent[3], axis[3], v1_co_global[3], v2_co_global[3]; int steps, turns; int valence; - + uint objects_empty_len = 0; + uint failed_axis_len = 0; + uint failed_vertices_len = 0; turns = RNA_int_get(op->ptr, "turns"); steps = RNA_int_get(op->ptr, "steps"); RNA_float_get_array(op->ptr, "center", cent); RNA_float_get_array(op->ptr, "axis", axis); - if (is_zero_v3(axis)) { - BKE_report(op->reports, RPT_ERROR, "Invalid/unset axis"); - return OPERATOR_CANCELLED; - } + uint objects_len = 0; + ViewLayer *view_layer = CTX_data_view_layer(C); + Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len); - /* find two vertices with valence count == 1, more or less is wrong */ - v1 = NULL; - v2 = NULL; + for (uint ob_index = 0; ob_index < objects_len; ob_index++) { + Object *obedit = objects[ob_index]; + BMEditMesh *em = BKE_editmesh_from_object(obedit); + BMesh *bm = em->bm; - BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { - valence = 0; - BM_ITER_ELEM (eed, &eiter, eve, BM_EDGES_OF_VERT) { - if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) { - valence++; + if (bm->totvertsel < 2) { + if (bm->totvertsel == 0) { + objects_empty_len++; } + continue; } - if (valence == 1) { - if (v1 == NULL) { - v1 = eve; - } - else if (v2 == NULL) { - v2 = eve; + if (is_zero_v3(axis)) { + failed_axis_len++; + continue; + } + + /* find two vertices with valence count == 1, more or less is wrong */ + v1 = NULL; + v2 = NULL; + + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { + valence = 0; + BM_ITER_ELEM (eed, &eiter, eve, BM_EDGES_OF_VERT) { + if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) { + valence++; + } } - else { - v1 = NULL; - break; + + if (valence == 1) { + if (v1 == NULL) { + v1 = eve; + } + else if (v2 == NULL) { + v2 = eve; + } + else { + v1 = NULL; + break; + } } } - } - if (v1 == NULL || v2 == NULL) { - BKE_report(op->reports, RPT_ERROR, "You have to select a string of connected vertices too"); - return OPERATOR_CANCELLED; - } + if (v1 == NULL || v2 == NULL) { + failed_vertices_len++; + continue; + } - copy_v3_v3(nor, obedit->obmat[2]); + copy_v3_v3(nor, obedit->obmat[2]); - /* calculate dvec */ - mul_v3_m4v3(v1_co_global, obedit->obmat, v1->co); - mul_v3_m4v3(v2_co_global, obedit->obmat, v2->co); - sub_v3_v3v3(dvec, v1_co_global, v2_co_global); - mul_v3_fl(dvec, 1.0f / steps); + /* calculate dvec */ + mul_v3_m4v3(v1_co_global, obedit->obmat, v1->co); + mul_v3_m4v3(v2_co_global, obedit->obmat, v2->co); + sub_v3_v3v3(dvec, v1_co_global, v2_co_global); + mul_v3_fl(dvec, 1.0f / steps); - if (dot_v3v3(nor, dvec) > 0.0f) - negate_v3(dvec); + if (dot_v3v3(nor, dvec) > 0.0f) + negate_v3(dvec); - if (!EDBM_op_init(em, &spinop, op, - "spin geom=%hvef cent=%v axis=%v dvec=%v steps=%i angle=%f space=%m4 use_duplicate=%b", - BM_ELEM_SELECT, cent, axis, dvec, turns * steps, DEG2RADF(360.0f * turns), obedit->obmat, false)) - { - return OPERATOR_CANCELLED; - } - BMO_op_exec(bm, &spinop); - EDBM_flag_disable_all(em, BM_ELEM_SELECT); - BMO_slot_buffer_hflag_enable(bm, spinop.slots_out, "geom_last.out", BM_ALL_NOLOOP, BM_ELEM_SELECT, true); - if (!EDBM_op_finish(em, &spinop, op, true)) { - return OPERATOR_CANCELLED; + BMOperator spinop; + if (!EDBM_op_init(em, &spinop, op, + "spin geom=%hvef cent=%v axis=%v dvec=%v steps=%i angle=%f space=%m4 use_duplicate=%b", + BM_ELEM_SELECT, cent, axis, dvec, turns * steps, DEG2RADF(360.0f * turns), obedit->obmat, false)) + { + continue; + } + + BMO_op_exec(bm, &spinop); + EDBM_flag_disable_all(em, BM_ELEM_SELECT); + BMO_slot_buffer_hflag_enable(bm, spinop.slots_out, "geom_last.out", BM_ALL_NOLOOP, BM_ELEM_SELECT, true); + + if (!EDBM_op_finish(em, &spinop, op, true)) { + continue; + } + + EDBM_update_generic(em, true, true); } + MEM_freeN(objects); - EDBM_update_generic(em, true, true); + if (failed_axis_len == objects_len - objects_empty_len) { + BKE_report(op->reports, RPT_ERROR, "Invalid/unset axis"); + } + else if (failed_vertices_len == objects_len - objects_empty_len) { + BKE_report(op->reports, RPT_ERROR, "You have to select a string of connected vertices too"); + } return OPERATOR_FINISHED; } @@ -146,7 +177,7 @@ static int edbm_screw_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED( PropertyRNA *prop; prop = RNA_struct_find_property(op->ptr, "center"); if (!RNA_property_is_set(op->ptr, prop)) { - RNA_property_float_set_array(op->ptr, prop, ED_view3d_cursor3d_get(scene, v3d)); + RNA_property_float_set_array(op->ptr, prop, ED_view3d_cursor3d_get(scene, v3d)->location); } if (rv3d) { prop = RNA_struct_find_property(op->ptr, "axis"); |