[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50242] trunk/blender/source/blender/ editors/space_sequencer/sequencer_edit.c: Fix #31853: Marker deletion invokes strip deletion

[Sergey Sharybin]

Revision: 50242
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50242
Author:   nazgul
Date:     2012-08-27 09:15:48 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
Fix #31853: Marker deletion invokes strip deletion

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c       
2012-08-27 09:02:26 UTC (rev 50241)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c       
2012-08-27 09:15:48 UTC (rev 50242)
@@ -1668,7 +1668,21 @@
        return OPERATOR_FINISHED;
 }
 
+static int sequencer_delete_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+       ARegion *ar = CTX_wm_region(C);
 
+       if (ar->regiontype == RGN_TYPE_WINDOW) {
+               /* bounding box of 30 pixels is used for markers shortcuts,
+                * prevent conflict with markers shortcurts here
+                */
+               if (event->mval[1] <= 30)
+                       return OPERATOR_PASS_THROUGH;
+       }
+
+       return WM_operator_confirm(C, op, event);
+}
+
 void SEQUENCER_OT_delete(wmOperatorType *ot)
 {
 
@@ -1678,7 +1692,7 @@
        ot->description = "Erase selected strips from the sequencer";
        
        /* api callbacks */
-       ot->invoke = WM_operator_confirm;
+       ot->invoke = sequencer_delete_invoke;
        ot->exec = sequencer_delete_exec;
        ot->poll = sequencer_edit_poll;
        

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