diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-10 10:16:21 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-10 10:16:21 +0400 |
| commit | 3453ec8fae3b55a2a50e8bfd298b836c38ce7e41 (patch) | |
| tree | e76f6edd29f2172e9b3746f373c0fa3762747993 /source/blender/editors/uvedit | |
| parent | d7b8e7e9bcc63447e708c2709b51fe4fdb7930f2 (diff) | |
reviewed selection flushing code, some of this was incorrect, checked all uses against trunk.
loop select also was incorrectly calling EDBM_select_flush() rather then EDBM_store_selection(), tsk tsk. (and strange nobody noticed this).
Diffstat (limited to 'source/blender/editors/uvedit')
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index f7bc631e27c..a3dcec011ef 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -2176,15 +2176,19 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop) } } +#if 0 /* BM_Select API handles all of this? */ + if(sync) { /* flush for mesh selection */ if(ts->selectmode != SCE_SELECT_FACE) { - if(flush==1) EDBM_select_mode_flush(em, ts->selectmode); - //else if(flush==-1) EDBM_deselect_flush(em); <-- I think this takes care of itself. . . + if(flush==1) EDBM_select_flush(em); + else if(flush==-1) EDBM_deselect_flush(em); } } - DAG_id_tag_update(obedit->data, 0); +#endif + + DAG_id_tag_update(obedit->data, 0); WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data); BLI_array_free(hitv); @@ -2680,11 +2684,11 @@ static int border_select_exec(bContext *C, wmOperator *op) if(change) { /* make sure newly selected vert selection is updated*/ -#if 0 //ok, I think the BM_Select API handles all of this? +#if 0 /* BM_Select API handles all of this? */ if(ts->uv_flag & UV_SYNC_SELECTION) { if(ts->selectmode != SCE_SELECT_FACE) { - if(select) EM_select_flush(em); - else EM_deselect_flush(em); + if(select) EDBM_select_flush(em); + else EDBM_deselect_flush(em); } } #endif |