[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36307] branches/bmesh/blender/source/ blender/editors: =bmesh= removed annoying preview thingy on edge ring select

[Joseph Eagar]

Revision: 36307
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36307
Author:   joeedh
Date:     2011-04-24 07:02:45 +0000 (Sun, 24 Apr 2011)
Log Message:
-----------
=bmesh= removed annoying preview thingy on edge ring select

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c
    branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
    branches/bmesh/blender/source/blender/editors/transform/transform.c

Modified: branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c  
2011-04-24 05:13:35 UTC (rev 36306)
+++ branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c  
2011-04-24 07:02:45 UTC (rev 36307)
@@ -666,6 +666,9 @@
        float origin[3], invmat[4][4];
        float epsilon = 0.01f; 
        
+       if (r3d->persp == RV3D_ORTHO) {
+               VECCOPY(origin, r3d->winmat[3]);
+       }
        VECCOPY(origin, r3d->viewinv[3]);
        invert_m4_m4(invmat, obedit->obmat);
        mul_m4_v3(invmat, origin);

Modified: branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/loopcut.c        
2011-04-24 05:13:35 UTC (rev 36306)
+++ branches/bmesh/blender/source/blender/editors/mesh/loopcut.c        
2011-04-24 07:02:45 UTC (rev 36307)
@@ -391,9 +391,6 @@
        if (!ringsel_init(C, op, 0))
                return OPERATOR_CANCELLED;
        
-       /* add a modal handler for this operator - handles loop selection */
-       WM_event_add_modal_handler(C, op);
-
        lcd = op->customdata;
        
        if (lcd->em->selectmode == SCE_SELECT_FACE) {
@@ -406,12 +403,14 @@
        lcd->vc.mval[1] = evt->mval[1];
        
        edge = EDBM_findnearestedge(&lcd->vc, &dist);
-       if (edge != lcd->eed) {
-               lcd->eed = edge;
-               ringsel_find_edge(lcd, 1);
-       }
 
-       return OPERATOR_RUNNING_MODAL;
+       lcd->eed = edge;
+       
+       ringsel_find_edge(lcd, 1);
+       ringsel_finish(C, op);
+       ringsel_exit(C, op);
+
+       return OPERATOR_FINISHED;
 }
 
 static int ringcut_invoke (bContext *C, wmOperator *op, wmEvent *evt)
@@ -599,12 +598,10 @@
        
        /* callbacks */
        ot->invoke= ringsel_invoke;
-       ot->modal= ringsel_modal;
-       ot->cancel= ringcut_cancel;
        ot->poll= ED_operator_editmesh_region_view3d; 
        
        /* flags */
-       ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+       ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
        RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend the 
selection");
 }

Modified: branches/bmesh/blender/source/blender/editors/transform/transform.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/transform/transform.c 
2011-04-24 05:13:35 UTC (rev 36306)
+++ branches/bmesh/blender/source/blender/editors/transform/transform.c 
2011-04-24 07:02:45 UTC (rev 36307)
@@ -4561,7 +4561,6 @@
                                        if (!BMBVH_EdgeVisible(btree, e2, v3d, 
t->obedit))
                                                continue;
                                        
-                                       
                                        j = 
GET_INT_FROM_POINTER(BLI_smallhash_lookup(&table, (uintptr_t)v));
 
                                        if (tempsv[j].down) {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs