diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5843e27f..cf95a052 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index ab8063e8..7decccb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 0.21.0 (wip) + +## Breaking changes + +- require Blender 2.91.2 + # 0.20.0 (22-01-2020) ## Features diff --git a/mixer/__init__.py b/mixer/__init__.py index 98ceff4d..d13c86e8 100644 --- a/mixer/__init__.py +++ b/mixer/__init__.py @@ -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", diff --git a/mixer/blender_data/tests/test_misc.py b/mixer/blender_data/tests/test_misc.py index 9836aa35..7d376c21 100644 --- a/mixer/blender_data/tests/test_misc.py +++ b/mixer/blender_data/tests/test_misc.py @@ -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"]