diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-05 23:46:04 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-05 23:46:04 +0300 |
commit | 8dff53898965b5ea07a99245071098207d3f197e (patch) | |
tree | 6d15750b7009796ac7176bb3063145e2dc12b66b /source/blender/makesrna/intern/rna_wm.c | |
parent | 45fdf41be87fb0b2fbf85778a714537ed1f5eca3 (diff) | |
parent | 0e2915b2929aa312a03bc4d3a606bb8073fcead0 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_wm.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 7dc8ab54800..3432adc6eb3 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -536,7 +536,7 @@ static int rna_Operator_name_length(PointerRNA *ptr) return strlen(op->type->name); } -static int rna_Operator_has_reports_get(PointerRNA *ptr) +static bool rna_Operator_has_reports_get(PointerRNA *ptr) { wmOperator *op = (wmOperator *)ptr->data; return (op->reports && op->reports->list.first); @@ -608,7 +608,7 @@ static float rna_Event_pressure_get(PointerRNA *ptr) return WM_event_tablet_data(event, NULL, NULL); } -static int rna_Event_is_tablet_get(PointerRNA *ptr) +static bool rna_Event_is_tablet_get(PointerRNA *ptr) { const wmEvent *event = ptr->data; return WM_event_is_tablet(event); @@ -914,7 +914,7 @@ static const EnumPropertyItem *rna_KeyMapItem_propvalue_itemf(bContext *C, Point return rna_enum_keymap_propvalue_items; /* ERROR */ } -static int rna_KeyMapItem_any_get(PointerRNA *ptr) +static bool rna_KeyMapItem_any_get(PointerRNA *ptr) { wmKeyMapItem *kmi = (wmKeyMapItem *)ptr->data; @@ -930,7 +930,7 @@ static int rna_KeyMapItem_any_get(PointerRNA *ptr) } } -static void rna_KeyMapItem_any_set(PointerRNA *ptr, int value) +static void rna_KeyMapItem_any_set(PointerRNA *ptr, bool value) { wmKeyMapItem *kmi = (wmKeyMapItem *)ptr->data; @@ -942,25 +942,25 @@ static void rna_KeyMapItem_any_set(PointerRNA *ptr, int value) } } -static int rna_KeyMapItem_shift_get(PointerRNA *ptr) +static bool rna_KeyMapItem_shift_get(PointerRNA *ptr) { wmKeyMapItem *kmi = (wmKeyMapItem *)ptr->data; return kmi->shift != 0; } -static int rna_KeyMapItem_ctrl_get(PointerRNA *ptr) +static bool rna_KeyMapItem_ctrl_get(PointerRNA *ptr) { wmKeyMapItem *kmi = (wmKeyMapItem *)ptr->data; return kmi->ctrl != 0; } -static int rna_KeyMapItem_alt_get(PointerRNA *ptr) +static bool rna_KeyMapItem_alt_get(PointerRNA *ptr) { wmKeyMapItem *kmi = (wmKeyMapItem *)ptr->data; return kmi->alt != 0; } -static int rna_KeyMapItem_oskey_get(PointerRNA *ptr) +static bool rna_KeyMapItem_oskey_get(PointerRNA *ptr) { wmKeyMapItem *kmi = (wmKeyMapItem *)ptr->data; return kmi->oskey != 0; @@ -1031,7 +1031,7 @@ static int rna_wmKeyMapItem_name_length(PointerRNA *ptr) return strlen(ot ? RNA_struct_ui_name(ot->srna) : kmi->idname); } -static int rna_KeyMapItem_userdefined_get(PointerRNA *ptr) +static bool rna_KeyMapItem_userdefined_get(PointerRNA *ptr) { wmKeyMapItem *kmi = ptr->data; return kmi->id < 0; |