Skip to content
This repository has been archived by the owner on Aug 1, 2022. It is now read-only.

Support Blender 3. #37

Closed
wants to merge 5 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Convert six assignment statements enhancement.
Co-authored-by: [email protected]
fire committed Dec 19, 2021
commit e3d2b66f12844f711a4ac39e3294fcaedd45bd47
2 changes: 1 addition & 1 deletion mixer/blender_client/client.py
Original file line number Diff line number Diff line change
@@ -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):
2 changes: 1 addition & 1 deletion mixer/blender_client/mesh.py
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion mixer/blender_data/specifics.py
Original file line number Diff line number Diff line change
@@ -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]):
4 changes: 2 additions & 2 deletions mixer/blender_data/tests/test_end_to_end.py
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion mixer/broadcaster/common.py
Original file line number Diff line number Diff line change
@@ -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)