diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-03-07 18:03:36 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-07 18:03:36 +0300 |
commit | d59627d3614b91aea70492b6e00f50b69f25bd68 (patch) | |
tree | f60dc7662c82fa4e59ce5e42167aecb628ac4878 | |
parent | f02af0407fbcb4924a1a1f938629c814259ce086 (diff) | |
parent | 118fb9f1f7436e6c8cd3ccae7c6c2c12f0c1b9fc (diff) |
Merge branch 'master' into blender2.8
-rw-r--r-- | source/blender/editors/mesh/editmesh_select.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index 7b88b091672..1d732f74b8d 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -1297,7 +1297,7 @@ static int edbm_select_similar_region_exec(bContext *C, wmOperator *op) MEM_freeN(group_index); if (changed) { - WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit); + WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data); } else { BKE_report(op->reports, RPT_WARNING, "No matching face regions found"); @@ -1490,7 +1490,7 @@ static int edbm_loop_multiselect_exec(bContext *C, wmOperator *op) MEM_freeN(edarray); // if (EM_texFaceCheck()) - WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit); + WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data); return OPERATOR_FINISHED; } @@ -1699,7 +1699,7 @@ static bool mouse_mesh_loop(bContext *C, const int mval[2], bool extend, bool de } } - WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit); + WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit->data); return true; } @@ -1786,7 +1786,7 @@ static int edbm_select_all_exec(bContext *C, wmOperator *op) break; } - WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit); + WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data); return OPERATOR_FINISHED; } @@ -1814,7 +1814,7 @@ static int edbm_faces_select_interior_exec(bContext *C, wmOperator *UNUSED(op)) BMEditMesh *em = BKE_editmesh_from_object(obedit); if (EDBM_select_interior_faces(em)) { - WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit); + WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data); return OPERATOR_FINISHED; } @@ -1971,7 +1971,7 @@ bool EDBM_select_pick(bContext *C, const int mval[2], bool extend, bool deselect } - WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit); + WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit->data); return true; } @@ -2683,7 +2683,7 @@ static int edbm_select_linked_exec(bContext *C, wmOperator *op) select_linked_delimit_end(em); } - WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit); + WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data); return OPERATOR_FINISHED; } @@ -2853,7 +2853,7 @@ static int edbm_select_linked_pick_invoke(bContext *C, wmOperator *op, const wmE /* return warning! */ if (unified_findnearest(&eval_ctx, &vc, &eve, &eed, &efa) == 0) { - WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit); + WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data); return OPERATOR_CANCELLED; } @@ -2874,7 +2874,7 @@ static int edbm_select_linked_pick_invoke(bContext *C, wmOperator *op, const wmE RNA_int_set(op->ptr, "index", index); - WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit); + WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data); return OPERATOR_FINISHED; } @@ -2903,7 +2903,7 @@ static int edbm_select_linked_pick_exec(bContext *C, wmOperator *op) edbm_select_linked_pick_ex(em, ele, sel, delimit); - WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit); + WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data); return OPERATOR_FINISHED; } @@ -3141,7 +3141,7 @@ static int edbm_select_more_exec(bContext *C, wmOperator *op) EDBM_select_more(em, use_face_step); - WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit); + WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data); return OPERATOR_FINISHED; } @@ -3170,7 +3170,7 @@ static int edbm_select_less_exec(bContext *C, wmOperator *op) EDBM_select_less(em, use_face_step); - WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit); + WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data); return OPERATOR_FINISHED; } |