← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/blender/editors/space_image/image_buttons.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/space_image/image_buttons.c
886
886
        BLI_addtail(&art->paneltypes, pt);
887
887
}
888
888
 
889
 
static int image_properties(bContext *C, wmOperator *UNUSED(op))
 
889
static int image_properties_toggle_exec(bContext *C, wmOperator *UNUSED(op))
890
890
{
891
891
        ScrArea *sa = CTX_wm_area(C);
892
892
        ARegion *ar = image_has_buttons_region(sa);
903
903
        ot->idname = "IMAGE_OT_properties";
904
904
        ot->description = "Toggle display properties panel";
905
905
        
906
 
        ot->exec = image_properties;
 
906
        ot->exec = image_properties_toggle_exec;
907
907
        ot->poll = ED_operator_image_active;
908
908
        
909
909
        /* flags */
910
910
        ot->flag = 0;
911
911
}
912
912
 
913
 
static int image_scopes(bContext *C, wmOperator *UNUSED(op))
 
913
static int image_scopes_toggle_exec(bContext *C, wmOperator *UNUSED(op))
914
914
{
915
915
        ScrArea *sa = CTX_wm_area(C);
916
916
        ARegion *ar = image_has_scope_region(sa);
927
927
        ot->idname = "IMAGE_OT_scopes";
928
928
        ot->description = "Toggle display scopes panel";
929
929
        
930
 
        ot->exec = image_scopes;
 
930
        ot->exec = image_scopes_toggle_exec;
931
931
        ot->poll = ED_operator_image_active;
932
932
        
933
933
        /* flags */