diff options
| -rwxr-xr-x | release/bin/blender-thumbnailer.py | 3 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_ops.c | 5 | ||||
| -rw-r--r-- | source/blender/editors/screen/area.c | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/release/bin/blender-thumbnailer.py b/release/bin/blender-thumbnailer.py index 91aeb7af2ab..779c6156e70 100755 --- a/release/bin/blender-thumbnailer.py +++ b/release/bin/blender-thumbnailer.py @@ -42,8 +42,9 @@ def open_wrapper_get(): class GFileWrapper: __slots__ = ("mode", "g_file") + def __init__(self, url, mode='r'): - self.mode = mode # used in gzip module + self.mode = mode # used in gzip module self.g_file = Gio.File.parse_name(url).read(None) def read(self, size): diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index d6a758bb059..ba289bb4de4 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -1164,7 +1164,7 @@ static void get_profile_point(BevelParams *bp, const Profile *pro, int i, int n, } } -/* Calculcate the actual coordinate values for bndv's profile. +/* Calculate the actual coordinate values for bndv's profile. * This is only needed if bp->seg > 1. * Allocate the space for them if that hasn't been done already. * If bp->seg is not a power of 2, also need to calculate 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 */ |