Bumped version to 1.24

Upgrade to BAT to fix doubly-compressed blend files.

This also changes the way the wheel files are loaded, as the old
alphabetical ordering won't pick up on BAT 1.10. It now uses the
modification time of the wheel files to find the latest one.

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Blender Cloud changelog
 
+
+## Version 1.24 (2022-02-04)
+
+- Bump blender-asset-tracer version 1.8 → 1.10, for fixing a bug where files were doubly-compressed.
+
+
+## Version 1.23 (2021-11-09)
+
+- Bump blender-asset-tracer version 1.7 → 1.8, for compatibility with sending read-only blend files to Flamenco.
+
+
+## Version 1.22 (2021-11-05)
+
+- Fix Windows incompatibility when using Shaman URLs as job storage path.
+- Bump blender-asset-tracer version 1.6 → 1.7, for compatibility with files compressed by Blender 3.0.
+
+
 ## Version 1.21 (2021-07-27)
 
 - Bump blender-asset-tracer version 1.5.1 → 1.6, for better compatibility with Geometry Nodes.

blender_cloud/__init__.py

@@ -21,7 +21,7 @@
 bl_info = {
     "name": "Blender Cloud",
     "author": "Sybren A. Stüvel, Francesco Siddi, Inês Almeida, Antony Riakiotakis",
-    "version": (1, 21),
+    "version": (1, 24),
     "blender": (2, 80, 0),
     "location": "Addon Preferences panel, and Ctrl+Shift+Alt+A anywhere for texture browser",
     "description": "Texture library browser and Blender Sync. Requires the Blender ID addon "

blender_cloud/attract/__init__.py

@@ -668,6 +668,8 @@ class ATTRACT_OT_open_meta_blendfile(AttractOperatorMixin, Operator):
 
     @classmethod
     def poll(cls, context):
+        if context.selected_sequences is None:
+            return False
         return bool(
             any(cls.filename_from_metadata(s) for s in context.selected_sequences)
         )

blender_cloud/flamenco/__init__.py

@@ -42,11 +42,10 @@ else:
     from .. import blender
 
 import bpy
-from bpy.types import AddonPreferences, Operator, WindowManager, Scene, PropertyGroup
+from bpy.types import Operator, PropertyGroup
 from bpy.props import (
     StringProperty,
     EnumProperty,
-    PointerProperty,
     BoolProperty,
     IntProperty,
 )
@@ -271,7 +270,7 @@ def is_file_inside_job_storage(prefs, current_file: typing.Union[str, Path]) ->
 
     if isinstance(current_file, str):
         # Shaman URLs are always remote, so the current file cannot be in there.
-        if is_shaman_url(current_file):
+        if is_shaman_url(prefs.flamenco_job_file_path):
             return False
         current_file = Path(current_file)
 
@@ -955,7 +954,7 @@ async def create_job(
     *,
     priority: int = 50,
     job_description: str = None,
-    start_paused=False
+    start_paused=False,
 ) -> dict:
     """Creates a render job at Flamenco Server, returning the job object as dictionary."""
 
@@ -1008,7 +1007,7 @@ def _render_output_path(
     render_image_format: str,
     flamenco_render_frame_range: str,
     *,
-    include_rel_path: bool = True
+    include_rel_path: bool = True,
 ) -> typing.Optional[PurePath]:
     """Cached version of render_output_path()
 

blender_cloud/wheels/__init__.py

@@ -58,8 +58,12 @@ def wheel_filename(fname_prefix: str) -> str:
     if not wheels:
         raise RuntimeError("Unable to find wheel at %r" % path_pattern)
 
-    # If there are multiple wheels that match, load the latest one.
-    wheels.sort()
+    # If there are multiple wheels that match, load the last-modified one.
+    # Alphabetical sorting isn't going to cut it since BAT 1.10 was released.
+    def modtime(filename: str) -> int:
+        return os.stat(filename).st_mtime
+
+    wheels.sort(key=modtime)
     return wheels[-1]
 
 
@@ -68,3 +72,8 @@ def load_wheels():
     load_wheel("lockfile", "lockfile")
     load_wheel("cachecontrol", "CacheControl")
     load_wheel("pillarsdk", "pillarsdk")
+
+
+if __name__ == "__main__":
+    wheel = wheel_filename("blender_asset_tracer")
+    print(f"Wheel: {wheel}")

requirements.txt

@@ -3,7 +3,7 @@
 lockfile==0.12.2
 pillarsdk==1.8.0
 wheel==0.29.0
-blender-asset-tracer==1.6
+blender-asset-tracer==1.10
 
 # Secondary requirements:
 asn1crypto==0.24.0

setup.py

@@ -250,7 +250,7 @@ setup(
     },
     name="blender_cloud",
     description="The Blender Cloud addon allows browsing the Blender Cloud from Blender.",
-    version="1.21",
+    version="1.24",
     author="Sybren A. Stüvel",
     author_email="sybren@stuvel.eu",
     packages=find_packages("."),