← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to source/blender/editors/animation/anim_markers.c

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/editors/animation/anim_markers.c
553
553
/* ************************** add markers *************************** */
554
554
 
555
555
/* add TimeMarker at curent frame */
556
 
static int ed_marker_add(bContext *C, wmOperator *UNUSED(op))
 
556
static int ed_marker_add_exec(bContext *C, wmOperator *UNUSED(op))
557
557
{
558
558
        ListBase *markers = ED_context_get_markers(C);
559
559
        TimeMarker *marker;
593
593
        ot->idname = "MARKER_OT_add";
594
594
        
595
595
        /* api callbacks */
596
 
        ot->exec = ed_marker_add;
 
596
        ot->exec = ed_marker_add_exec;
597
597
        ot->invoke = ed_markers_opwrap_invoke;
598
598
        ot->poll = ED_operator_animview_active;
599
599
        
763
763
        MarkerMove *mm = op->customdata;
764
764
        View2D *v2d = UI_view2d_fromcontext(C);
765
765
        TimeMarker *marker, *selmarker = NULL;
766
 
        float dx, fac;
767
766
        char str[256];
768
767
                
769
768
        switch (event->type) {
791
790
                        }
792
791
                        break;
793
792
                case MOUSEMOVE:
 
793
                {
 
794
                        float dx, fac;
 
795
 
794
796
                        if (hasNumInput(&mm->num))
795
797
                                break;
796
798
                        
863
865
                                
864
866
                                ED_area_headerprint(CTX_wm_area(C), str);
865
867
                        }
 
868
                        break;
 
869
                }
866
870
        }
867
871
 
868
872
        if (event->val == KM_PRESS) {
1376
1380
                RNA_string_set(op->ptr, "name", marker->name);
1377
1381
        
1378
1382
        /* now see if the operator is usable */
1379
 
        return ed_markers_opwrap_invoke_custom(C, op, event, WM_operator_props_popup);
 
1383
        return ed_markers_opwrap_invoke_custom(C, op, event, WM_operator_props_popup_confirm);
1380
1384
}
1381
1385
 
1382
1386
static void MARKER_OT_rename(wmOperatorType *ot)