diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-08-27 10:04:16 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-27 10:09:15 +0300 |
commit | 8b009e258c36eca920a5c5eeb430634ad62f610f (patch) | |
tree | f5722cd0caf369416efa40b7a2a63fdea829756e /source/blender | |
parent | 34c97a1b003143bb79e8b08dec339b9ad13a17f6 (diff) |
BMesh: improvements/fixes to select side of active
- Add orientation option (defaults to local, as 2.7x does)
can optionally use global, cursor, view... etc.
- Fix typo which caused select flush to fail.
- Fix for instanced objects (was only checking one instance).
- Only tag for changes if a change is made.
- Skip meshes with all vertices selected.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/mesh/editmesh_select.c | 99 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_gizmo_3d.c | 8 | ||||
-rw-r--r-- | source/blender/makesrna/RNA_enum_types.h | 1 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 6 |
4 files changed, 65 insertions, 49 deletions
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index 265734130c9..7ecd2c69838 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -59,6 +59,7 @@ #include "ED_mesh.h" #include "ED_screen.h" +#include "ED_transform.h" #include "ED_select_utils.h" #include "ED_view3d.h" @@ -4331,82 +4332,100 @@ void MESH_OT_select_ungrouped(wmOperatorType *ot) * \{ */ enum { - SELECT_AXIS_POSITIVE = 0, - SELECT_AXIS_NEGATIVE = 1, - SELECT_AXIS_ALIGNED = 2, + SELECT_AXIS_POS = 0, + SELECT_AXIS_NEG = 1, + SELECT_AXIS_ALIGN = 2, }; -enum { - SELECT_AXIS_X = 0, - SELECT_AXIS_Y = 1, - SELECT_AXIS_Z = 2, -}; - -/* BMESH_TODO - some way to select on an arbitrary axis */ static int edbm_select_axis_exec(bContext *C, wmOperator *op) { + Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); Object *obedit = CTX_data_edit_object(C); BMEditMesh *em = BKE_editmesh_from_object(obedit); BMVert *v_act = BM_mesh_active_vert_get(em->bm); + const int orientation = RNA_enum_get(op->ptr, "orientation"); const int axis = RNA_enum_get(op->ptr, "axis"); - const int mode = RNA_enum_get(op->ptr, "mode"); + const int sign = RNA_enum_get(op->ptr, "sign"); if (v_act == NULL) { BKE_report(op->reports, RPT_WARNING, "This operator requires an active vertex (last selected)"); return OPERATOR_CANCELLED; } - BMVert *v; - BMIter iter; const float limit = RNA_float_get(op->ptr, "threshold"); float value; - float vertex_world[3]; + float axis_mat[3][3]; - mul_v3_m4v3(vertex_world, obedit->obmat, v_act->co); - value = vertex_world[axis]; + /* 3D view variables may be NULL, (no need to check in poll function). */ + ED_transform_calc_orientation_from_type_ex( + C, axis_mat, + scene, CTX_wm_view3d(C), CTX_wm_region_view3d(C), obedit, obedit, + orientation, V3D_AROUND_ACTIVE); - if (mode == SELECT_AXIS_NEGATIVE) { + const float *axis_vector = axis_mat[axis]; + + { + float vertex_world[3]; + mul_v3_m4v3(vertex_world, obedit->obmat, v_act->co); + value = dot_v3v3(axis_vector, vertex_world); + } + + if (sign == SELECT_AXIS_NEG) { value += limit; } - else if (mode == SELECT_AXIS_POSITIVE) { + else if (sign == SELECT_AXIS_POS) { value -= limit; } uint objects_len = 0; - Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len); + Object **objects = BKE_view_layer_array_from_objects_in_edit_mode(view_layer, &objects_len); for (uint ob_index = 0; ob_index < objects_len; ob_index++) { Object *obedit_iter = objects[ob_index]; BMEditMesh *em_iter = BKE_editmesh_from_object(obedit_iter); BMesh *bm = em_iter->bm; + if (bm->totvert == bm->totvertsel) { + continue; + } + + BMIter iter; + BMVert *v; + bool changed = false; + BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) { - if (!BM_elem_flag_test(v, BM_ELEM_HIDDEN)) { + if (!BM_elem_flag_test(v, BM_ELEM_HIDDEN | BM_ELEM_SELECT)) { float v_iter_world[3]; mul_v3_m4v3(v_iter_world, obedit_iter->obmat, v->co); - switch (mode) { - case SELECT_AXIS_ALIGNED: - if (fabsf(v_iter_world[axis] - value) < limit) { + const float value_iter = dot_v3v3(axis_vector, v_iter_world); + switch (sign) { + case SELECT_AXIS_ALIGN: + if (fabsf(value_iter - value) < limit) { BM_vert_select_set(bm, v, true); + changed = true; } break; - case SELECT_AXIS_NEGATIVE: - if (v_iter_world[axis] < value) { + case SELECT_AXIS_NEG: + if (value_iter < value) { BM_vert_select_set(bm, v, true); + changed = true; } break; - case SELECT_AXIS_POSITIVE: - if (v_iter_world[axis] > value) { + case SELECT_AXIS_POS: + if (value_iter > value) { BM_vert_select_set(bm, v, true); + changed = true; } break; } } } - EDBM_selectmode_flush(em); - WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit_iter->data); - DEG_id_tag_update(obedit_iter->data, DEG_TAG_SELECT_UPDATE); + if (changed) { + EDBM_selectmode_flush(em_iter); + WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit_iter->data); + DEG_id_tag_update(obedit_iter->data, DEG_TAG_SELECT_UPDATE); + } } MEM_freeN(objects); return OPERATOR_FINISHED; @@ -4414,17 +4433,10 @@ static int edbm_select_axis_exec(bContext *C, wmOperator *op) void MESH_OT_select_axis(wmOperatorType *ot) { - static const EnumPropertyItem axis_mode_items[] = { - {SELECT_AXIS_POSITIVE, "POSITIVE", 0, "Positive Axis", ""}, - {SELECT_AXIS_NEGATIVE, "NEGATIVE", 0, "Negative Axis", ""}, - {SELECT_AXIS_ALIGNED, "ALIGNED", 0, "Aligned Axis", ""}, - {0, NULL, 0, NULL, NULL} - }; - - static const EnumPropertyItem axis_items_xyz[] = { - {SELECT_AXIS_X, "X_AXIS", 0, "X Axis", ""}, - {SELECT_AXIS_Y, "Y_AXIS", 0, "Y Axis", ""}, - {SELECT_AXIS_Z, "Z_AXIS", 0, "Z Axis", ""}, + static const EnumPropertyItem axis_sign_items[] = { + {SELECT_AXIS_POS, "POS", 0, "Positive Axis", ""}, + {SELECT_AXIS_NEG, "NEG", 0, "Negative Axis", ""}, + {SELECT_AXIS_ALIGN, "ALIGN", 0, "Aligned Axis", ""}, {0, NULL, 0, NULL, NULL} }; @@ -4441,8 +4453,9 @@ void MESH_OT_select_axis(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "mode", axis_mode_items, SELECT_AXIS_POSITIVE, "Axis Mode", "Axis side to use when selecting"); - RNA_def_enum(ot->srna, "axis", axis_items_xyz, SELECT_AXIS_X, "Axis", "Select the axis to compare each vertex on"); + RNA_def_enum(ot->srna, "orientation", rna_enum_transform_orientation_items, V3D_MANIP_LOCAL, "Axis Mode", "Axis orientation"); + RNA_def_enum(ot->srna, "sign", axis_sign_items, SELECT_AXIS_POS, "Axis Sign", "Side to select"); + RNA_def_enum(ot->srna, "axis", rna_enum_axis_xyz_items, 0, "Axis", "Select the axis to compare each vertex on"); RNA_def_float(ot->srna, "threshold", 0.0001f, 0.000001f, 50.0f, "Threshold", "", 0.00001f, 10.0f); } diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c index 03ed75d46a2..b831012ba23 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.c +++ b/source/blender/editors/transform/transform_gizmo_3d.c @@ -670,9 +670,11 @@ void ED_transform_calc_orientation_from_type_ex( } case V3D_MANIP_VIEW: { - copy_m3_m4(r_mat, rv3d->viewinv); - normalize_m3(r_mat); - ok = true; + if (rv3d != NULL) { + copy_m3_m4(r_mat, rv3d->viewinv); + normalize_m3(r_mat); + ok = true; + } break; } case V3D_MANIP_CURSOR: diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h index 9efa8475f8e..8d3d7f81deb 100644 --- a/source/blender/makesrna/RNA_enum_types.h +++ b/source/blender/makesrna/RNA_enum_types.h @@ -164,6 +164,7 @@ extern const EnumPropertyItem rna_enum_operator_context_items[]; extern const EnumPropertyItem rna_enum_wm_report_items[]; extern const EnumPropertyItem rna_enum_transform_pivot_items_full[]; +extern const EnumPropertyItem rna_enum_transform_orientation_items[]; extern const EnumPropertyItem rna_enum_transform_mode_types[]; extern const EnumPropertyItem rna_enum_posebone_rotmode_items[]; diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index fe32566028d..664271075e0 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -469,7 +469,7 @@ const EnumPropertyItem rna_enum_transform_pivot_items_full[] = { }; /* Icons could be made a consistent set of images. */ -static const EnumPropertyItem transform_orientation_items[] = { +const EnumPropertyItem rna_enum_transform_orientation_items[] = { {V3D_MANIP_GLOBAL, "GLOBAL", ICON_SCENE_DATA, "Global", "Align the transformation axes to world space"}, {V3D_MANIP_LOCAL, "LOCAL", ICON_MANIPUL, "Local", "Align the transformation axes to the selected objects' local space"}, {V3D_MANIP_NORMAL, "NORMAL", ICON_SNAP_NORMAL, "Normal", @@ -2012,7 +2012,7 @@ const EnumPropertyItem *rna_TransformOrientation_itemf( EnumPropertyItem *item = NULL; int i = V3D_MANIP_CUSTOM, totitem = 0; - RNA_enum_items_add(&item, &totitem, transform_orientation_items); + RNA_enum_items_add(&item, &totitem, rna_enum_transform_orientation_items); Scene *scene; if (ptr->type == &RNA_Scene) { @@ -6256,7 +6256,7 @@ void RNA_def_scene(BlenderRNA *brna) /* Orientations */ prop = RNA_def_property(srna, "transform_orientation", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "orientation_type"); - RNA_def_property_enum_items(prop, transform_orientation_items); + RNA_def_property_enum_items(prop, rna_enum_transform_orientation_items); RNA_def_property_enum_funcs(prop, "rna_Scene_transform_orientation_get", "rna_Scene_transform_orientation_set", "rna_TransformOrientation_itemf"); RNA_def_property_ui_text(prop, "Transform Orientation", "Transformation orientation"); |