diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-28 04:04:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-28 04:04:15 +0400 |
| commit | d3b945799176ad5b4c6739060a90bde810620feb (patch) | |
| tree | d82e8ede869f32416be8a9396f2ff4d3579e5cd0 /source/blender/editors | |
| parent | 11f3fc0efd02d01f0eb1f09c7088e8818b515809 (diff) | |
Code cleanup: style/warnings
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_ops.c | 5 | ||||
| -rw-r--r-- | source/blender/editors/screen/area.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index 9286b589983..370e2960709 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -230,8 +230,9 @@ static int unset_property_button_exec(bContext *C, wmOperator *UNUSED(op)) uiContextActiveProperty(C, &ptr, &prop, &index); /* if there is a valid property that is editable... */ - if (ptr.data && prop && RNA_property_editable(&ptr, prop) - /*&& RNA_property_is_idprop(prop)*/ && RNA_property_is_set(&ptr, prop)) + if (ptr.data && prop && RNA_property_editable(&ptr, prop) && + /* RNA_property_is_idprop(prop) && */ + RNA_property_is_set(&ptr, prop)) { RNA_property_unset(&ptr, prop); return operator_button_property_finish(C, &ptr, prop); diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index dbd12dbbf63..111e2f97f62 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -572,7 +572,9 @@ static void area_azone_initialize(wmWindow *win, bScreen *screen, ScrArea *sa) /* can't click on bottom corners on OS X, already used for resizing */ #ifdef __APPLE__ - if(!(sa->totrct.xmin == 0 && sa->totrct.ymin == 0) || WM_window_is_fullscreen(win)) + if (!(sa->totrct.xmin == 0 && sa->totrct.ymin == 0) || WM_window_is_fullscreen(win)) +#else + (void)win; #endif { /* set area action zones */ |