Skip to content

Commit

Permalink
feat: upgrade to Blender 2.91.2
Browse files Browse the repository at this point in the history
  • Loading branch information
PhilippeCrassous committed Feb 3, 2021
1 parent 869632e commit 8bafa88
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 35 deletions.
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ release:
tags:
- blender
variables:
MIXER_BLENDER_ZIP_BASENAME: blender-2.83.9-windows64
MIXER_BLENDER_VERSION_BASE: "2.83"
MIXER_BLENDER_ZIP_BASENAME: blender-2.91.2-windows64
MIXER_BLENDER_VERSION_BASE: "2.91"
MIXER_BASH_EXE: C:\Program Files\Git\bin\bash.exe
VRTIST_PORT: 25600 # In case a server is already running on our default port on the test computer
MIXER_TEST_OUTPUT: logs\tests
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 0.21.0 (wip)

## Breaking changes

- require Blender 2.91.2

# 0.20.0 (22-01-2020)

## Features
Expand Down
2 changes: 1 addition & 1 deletion mixer/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"author": "Ubisoft Animation Studio",
"description": "Collaborative 3D edition accross 3D software",
"version": (0, 20, 0), # Generated by inject_version.py
"blender": (2, 83, 9),
"blender": (2, 91, 2),
"location": "",
"warning": "Experimental addon, can break your scenes",
"wiki_url": "https://gitlab.com/ubisoft-animation-studio/mixer",
Expand Down
32 changes: 0 additions & 32 deletions mixer/blender_data/tests/test_misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,38 +89,6 @@ def test_blenddata_filtered(self):
scene_ = blend_data_["scenes"].search_one("Scene_0")._data
self.assertFalse("eevee" in scene_)

# @unittest.skip("")
def test_scene(self):
# test_misc.TestLoadProxy.test_scene
scene = self.proxy._data["scenes"].search_one("Scene_0")._data
# will vary slightly during tuning of the default filter
self.assertGreaterEqual(len(scene), 45)
self.assertLessEqual(len(scene), 55)

# objects = scene["objects"]._data
# self.assertEqual(4, len(objects))

# for o in objects.values():
# self.assertEqual(type(o), DatablockRefProxy, o)

# builtin attributes (floats)
frame_properties = [name for name in scene.keys() if name.startswith("frame_")]
self.assertEqual(7, len(frame_properties))

# bpy_struct
eevee = scene["eevee"]._data
self.assertEqual(58, len(eevee))

# Currently mot loaded
# # PropertiesGroup
# cycles_proxy = scene["view_layers"]._data["View Layer"]._data["cycles"]
# self.assertIsInstance(cycles_proxy, StructProxy)
# self.assertEqual(32, len(cycles_proxy._data))

# # The master collection
# master_collection = scene["collection"]
# self.assertIsInstance(master_collection, DatablockProxy)

def test_collections(self):
# test_misc.TestLoadProxy.test_collections
collections = self.proxy._data["collections"]
Expand Down

0 comments on commit 8bafa88

Please sign in to comment.