diff options
Diffstat (limited to 'release/scripts/startup/bl_operators')
-rw-r--r-- | release/scripts/startup/bl_operators/userpref.py | 3 | ||||
-rw-r--r-- | release/scripts/startup/bl_operators/uvcalc_lightmap.py | 7 | ||||
-rw-r--r-- | release/scripts/startup/bl_operators/wm.py | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/release/scripts/startup/bl_operators/userpref.py b/release/scripts/startup/bl_operators/userpref.py index b052f333d2a..0cd90610cdc 100644 --- a/release/scripts/startup/bl_operators/userpref.py +++ b/release/scripts/startup/bl_operators/userpref.py @@ -114,7 +114,8 @@ class PREFERENCES_OT_copy_prev(Operator): shutil.copytree(self._old_path(), self._new_path(), symlinks=True) - # reload recent-files.txt + # reload preferences and recent-files.txt + bpy.ops.wm.read_userpref() bpy.ops.wm.read_history() # don't loose users work if they open the splash later. diff --git a/release/scripts/startup/bl_operators/uvcalc_lightmap.py b/release/scripts/startup/bl_operators/uvcalc_lightmap.py index 2b20754a995..2befb7c73e2 100644 --- a/release/scripts/startup/bl_operators/uvcalc_lightmap.py +++ b/release/scripts/startup/bl_operators/uvcalc_lightmap.py @@ -565,7 +565,12 @@ def unwrap(operator, context, **kwargs): bpy.ops.object.mode_set(mode='OBJECT', toggle=False) # define list of meshes - meshes = list({me for obj in context.selected_objects if obj.type == 'MESH' for me in (obj.data,) if me.polygons and me.library is None}) + meshes = list({ + me for obj in context.selected_objects + if obj.type == 'MESH' + for me in (obj.data,) + if me.polygons and me.library is None + }) if not meshes: operator.report({'ERROR'}, "No mesh object") diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index cb9af88f45f..5a6db45c329 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -1107,7 +1107,7 @@ class WM_OT_doc_view(Operator): bl_label = "View Documentation" doc_id: doc_id - if bpy.app.version_cycle in {"release", "rc"}: + if bpy.app.version_cycle in {"release", "rc", "beta"}: _prefix = ("https://docs.blender.org/api/%d.%d%s" % (bpy.app.version[0], bpy.app.version[1], bpy.app.version_char)) else: @@ -1999,7 +1999,6 @@ class WM_OT_batch_rename(Operator): descr, ) - return data @staticmethod @@ -2042,7 +2041,7 @@ class WM_OT_batch_rename(Operator): if action.use_replace_regex_dst: replace_dst = action.replace_dst else: - replace_dst = re.escape(action.replace_dst) + replace_dst = action.replace_dst.replace("\\", "\\\\") else: replace_src = re.escape(action.replace_src) replace_dst = re.escape(action.replace_dst) |