diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md index 29e86866..e4d56bc5 100644 --- a/.gitlab/issue_templates/Bug.md +++ b/.gitlab/issue_templates/Bug.md @@ -1,6 +1,6 @@ ## Summary -(Use the [issue ckecklist](https://ubisoft-mixer.readthedocs.io/en/latest/troubleshoot/issue.html) to find out if your problem is known.) +(Use the [issue checklist](https://ubisoft-mixer.readthedocs.io/en/latest/troubleshoot/issue.html) to find out if your problem is known.) (Summarize the bug encountered concisely) @@ -28,4 +28,4 @@ Operating systems: (Attach the log files as documented in [reporting an issue](https://mixer-github.readthedocs.io/en/latest/troubleshoot/issue.html) -/label ~bug \ No newline at end of file +/label ~bug diff --git a/mixer/blender_client/client.py b/mixer/blender_client/client.py index 66f33a99..22ad23d7 100644 --- a/mixer/blender_client/client.py +++ b/mixer/blender_client/client.py @@ -547,7 +547,7 @@ def build_clear_animations(self, data): def build_save(self, data): filename, file_extension = os.path.splitext(bpy.data.filepath) if get_mixer_prefs().VRtist_suffix not in filename: - filename = filename + get_mixer_prefs().VRtist_suffix + file_extension + filename += get_mixer_prefs().VRtist_suffix + file_extension bpy.ops.wm.save_as_mainfile(filepath=filename, copy=True) def build_montage_mode(self, data): diff --git a/mixer/blender_client/mesh.py b/mixer/blender_client/mesh.py index 4f8b914f..c52f9af3 100644 --- a/mixer/blender_client/mesh.py +++ b/mixer/blender_client/mesh.py @@ -466,7 +466,7 @@ def decode_baked_mesh(obj: Optional[bpy.types.Object], data, index): face.loops[0][uv_layer].uv = uvs[current_uv_index] face.loops[1][uv_layer].uv = uvs[current_uv_index + 1] face.loops[2][uv_layer].uv = uvs[current_uv_index + 2] - current_uv_index = current_uv_index + 3 + current_uv_index += 3 except Exception: pass diff --git a/mixer/blender_data/specifics.py b/mixer/blender_data/specifics.py index 62c89c1c..7c960509 100644 --- a/mixer/blender_data/specifics.py +++ b/mixer/blender_data/specifics.py @@ -104,7 +104,7 @@ def _resize_geometry_types(): _node_groups: Tuple[type, ...] = (T.ShaderNodeGroup, T.CompositorNodeGroup, T.TextureNodeGroup) if bpy.app.version is not None and bpy.app.version >= (2, 92, 0): - _node_groups = _node_groups + (T.GeometryNodeGroup,) + _node_groups += (T.GeometryNodeGroup,) def dispatch_rna(no_rna_impl: Callable[..., Any]): diff --git a/mixer/blender_data/tests/test_end_to_end.py b/mixer/blender_data/tests/test_end_to_end.py index c332cbdc..c682abb5 100644 --- a/mixer/blender_data/tests/test_end_to_end.py +++ b/mixer/blender_data/tests/test_end_to_end.py @@ -51,7 +51,7 @@ def test_world(self): changeset = self.bpy_data_proxy.update(self.diff, {}, False, safe_properties) updates = changeset.creations # avoid clash on restore - world.name = world.name + "_bak" + world.name += "_bak" codec = Codec() for update in updates: @@ -82,7 +82,7 @@ def test_non_existing(self): changeset = self.bpy_data_proxy.update(self.diff, {}, False, safe_properties) creations = changeset.creations # avoid clash on restore - world.name = world.name + "_bak" + world.name += "_bak" codec = Codec() for update in creations: diff --git a/mixer/broadcaster/common.py b/mixer/broadcaster/common.py index 8aa99e5d..a9b0c7dd 100644 --- a/mixer/broadcaster/common.py +++ b/mixer/broadcaster/common.py @@ -373,7 +373,7 @@ def encode_string_array(values): def decode_string_array(data, index): count = bytes_to_int(data[index : index + 4]) - index = index + 4 + index += 4 values = [] for _ in range(count): string, index = decode_string(data, index) diff --git a/mixer/connection.py b/mixer/connection.py index 3d8bcd02..c727e08a 100644 --- a/mixer/connection.py +++ b/mixer/connection.py @@ -118,9 +118,9 @@ def start_local_server(): args = {"creationflags": subprocess.CREATE_NEW_CONSOLE} else: args = {} - + import sys share_data.local_server_process = subprocess.Popen( - [bpy.app.binary_path_python, "-m", "mixer.broadcaster.apps.server", "--port", str(get_mixer_prefs().port)], + [sys.executable, "-m", "mixer.broadcaster.apps.server", "--port", str(get_mixer_prefs().port)], cwd=dir_path, shell=False, **args,