update_version.sh: Use Python 3 in example command

This makes it possible to run the command outside of a Python 3 virtualenv.

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Blender Cloud changelog
 
+## Version 1.13 (2019-04-18)
+
+- Upgraded BAT to 1.1.1 for a compatibility fix with Blender 2.79
+- Flamenco: Support for Flamenco Manager settings versioning + for settings version 2.
+  When using Blender Cloud Add-on 1.12 or older, Flamenco Server will automatically convert the
+  Manager settings to version 1.
+- More Blender 2.80 compatibility fixes
+
+
 ## Version 1.12 (2019-03-25)
 
 - Flamenco: Change how progressive render tasks are created. Instead of the artist setting a fixed

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, 12, 0),
+    'version': (1, 13, 5),
     '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

@@ -63,6 +63,7 @@ from pillarsdk.projects import Project
 from pillarsdk import exceptions as sdk_exceptions
 
 from bpy.types import Operator, Panel, AddonPreferences
+import bl_ui.space_sequencer
 
 log = logging.getLogger(__name__)
 
@@ -639,8 +640,7 @@ class ATTRACT_OT_open_meta_blendfile(AttractOperatorMixin, Operator):
 
     @classmethod
     def poll(cls, context):
-        return AttractOperatorMixin.poll(context) and \
-               bool(any(cls.filename_from_metadata(s) for s in context.selected_sequences))
+        return bool(any(cls.filename_from_metadata(s) for s in context.selected_sequences))
 
     @staticmethod
     def filename_from_metadata(strip):
@@ -946,25 +946,31 @@ class ATTRACT_OT_project_open_in_browser(Operator):
         return {'FINISHED'}
 
 
-def draw_strip_movie_meta(self, context):
-    strip = active_strip(context)
-    if not strip:
-        return
+class ATTRACT_PT_strip_metadata(bl_ui.space_sequencer.SequencerButtonsPanel, Panel):
+    bl_label = "Metadata"
+    bl_parent_id = "SEQUENCER_PT_source"
+    bl_category = "Strip"
+    bl_options = {'DEFAULT_CLOSED'}
 
-    meta = strip.get('metadata', None)
-    if not meta:
-        return None
+    def draw(self, context):
+        strip = active_strip(context)
+        if not strip:
+            return
 
-    box = self.layout.column(align=True)
-    row = box.row(align=True)
-    fname = meta.get('BLEND_FILE', None) or None
-    if fname:
-        row.label(text='Original Blendfile: %s' % fname)
-        row.operator(ATTRACT_OT_open_meta_blendfile.bl_idname,
-                     text='', icon='FILE_BLEND')
-    sfra = meta.get('START_FRAME', '?')
-    efra = meta.get('END_FRAME', '?')
-    box.label(text='Original Frame Range: %s-%s' % (sfra, efra))
+        meta = strip.get('metadata', None)
+        if not meta:
+            return None
+
+        box = self.layout.column(align=True)
+        row = box.row(align=True)
+        fname = meta.get('BLEND_FILE', None) or None
+        if fname:
+            row.label(text='Original Blendfile: %s' % fname)
+            row.operator(ATTRACT_OT_open_meta_blendfile.bl_idname,
+                         text='', icon='FILE_BLEND')
+        sfra = meta.get('START_FRAME', '?')
+        efra = meta.get('END_FRAME', '?')
+        box.label(text='Original Frame Range: %s-%s' % (sfra, efra))
 
 
 def activate():
@@ -1023,8 +1029,6 @@ def register():
         name="Status")
     bpy.types.Sequence.atc_order = bpy.props.IntProperty(name="Order")
 
-    bpy.types.SEQUENCER_PT_edit.append(draw_strip_movie_meta)
-
     for cls in _rna_classes:
         bpy.utils.register_class(cls)
 

blender_cloud/blender.py

@@ -383,18 +383,17 @@ class BlenderCloudPreferences(AddonPreferences):
                           icon='TRIA_UP').action = 'PUSH'
 
         versions = bss.available_blender_versions
-        version = bss.version
         if bss.status in {'NONE', 'IDLE'}:
-            if not versions or not version:
+            if not versions:
                 row_pull.operator('pillar.sync',
                                   text='Find version to load',
                                   icon='TRIA_DOWN').action = 'REFRESH'
             else:
                 props = row_pull.operator('pillar.sync',
-                                          text='Load %s settings' % version,
+                                          text='Load %s settings' % bss.version,
                                           icon='TRIA_DOWN')
                 props.action = 'PULL'
-                props.blender_version = version
+                props.blender_version = bss.version
                 row_pull.operator('pillar.sync',
                                   text='',
                                   icon=SYNC_SELECT_VERSION_ICON).action = 'SELECT'
@@ -450,7 +449,7 @@ class BlenderCloudPreferences(AddonPreferences):
         manager_box = manager_split.row(align=True)
 
         if bcp.status in {'NONE', 'IDLE'}:
-            if not bcp.available_managers or not bcp.manager:
+            if not bcp.available_managers:
                 manager_box.operator('flamenco.managers',
                                      text='Find Flamenco Managers',
                                      icon='FILE_REFRESH')

blender_cloud/flamenco/__init__.py

@@ -199,18 +199,26 @@ class FLAMENCO_OT_fmanagers(async_loop.AsyncModalOperatorMixin,
         from ..blender import preferences
 
         prefs = preferences()
+        mypref = self.mypref
 
         self.log.info('Going to fetch managers for user %s', self.user_id)
 
-        self.mypref.status = 'FETCHING'
+        mypref.status = 'FETCHING'
         params = {'where': '{"projects" : "%s"}' % prefs.project.project}
         managers = await pillar_call(Manager.all, params)
 
         # We need to convert to regular dicts before storing in ID properties.
         # Also don't store more properties than we need.
-        as_list = [{'_id': p['_id'], 'name': p['name']} for p in managers['_items']]
+        as_list = [{'_id': man['_id'], 'name': man['name']}
+                   for man in managers['_items']]
+
+        current_manager = mypref.manager
+        mypref.available_managers = as_list
+
+        # Prevent warnings about the current manager not being in the EnumProperty items.
+        if as_list and not any(man['_id'] == current_manager for man in as_list):
+            mypref.manager = as_list[0]['_id']
 
-        self.mypref.available_managers = as_list
         self.quit()
 
     def quit(self):
@@ -427,7 +435,7 @@ class FLAMENCO_OT_render(async_loop.AsyncModalOperatorMixin,
 
             # Pop out some settings so that settings of irrelevant Managers are excluded.
             flamenco_managers_settings = project_settings.pop('flamenco_managers_settings', {})
-            flamenco_manager_settings = flamenco_managers_settings.pop(manager_id)
+            flamenco_manager_settings = flamenco_managers_settings.pop(manager_id, '-unknown-')
 
             info = {
                 '_meta': {'version': 2},

blender_cloud/flamenco/sdk.py

@@ -1,5 +1,6 @@
 import functools
 import pathlib
+import typing
 
 from pillarsdk.resource import List, Find, Create
 
@@ -9,8 +10,28 @@ class Manager(List, Find):
     path = 'flamenco/managers'
     PurePlatformPath = pathlib.PurePath
 
-    @functools.lru_cache()
-    def _sorted_path_replacements(self) -> list:
+    @functools.lru_cache(maxsize=1)
+    def _path_replacements(self) -> list:
+        """Defer to _path_replacements_vN() to get path replacement vars.
+
+        Returns a list of tuples (variable name, variable value).
+        """
+        settings_version = self.settings_version or 1
+        try:
+            settings_func = getattr(self, '_path_replacements_v%d' % settings_version)
+        except AttributeError:
+            raise RuntimeError('This manager has unsupported settings version %d; '
+                               'upgrade Blender Cloud add-on')
+
+        def longest_value_first(item):
+            var_name, var_value = item
+            return -len(var_value), var_value, var_name
+
+        replacements = settings_func()
+        replacements.sort(key=longest_value_first)
+        return replacements
+
+    def _path_replacements_v1(self) -> typing.List[typing.Tuple[str, str]]:
         import platform
 
         if self.path_replacement is None:
@@ -18,14 +39,35 @@ class Manager(List, Find):
 
         items = self.path_replacement.to_dict().items()
 
-        def by_length(item):
-            return -len(item[0]), item[0]
-
         this_platform = platform.system().lower()
         return [(varname, platform_replacements[this_platform])
-                for varname, platform_replacements in sorted(items, key=by_length)
+                for varname, platform_replacements in items
                 if this_platform in platform_replacements]
 
+    def _path_replacements_v2(self) -> typing.List[typing.Tuple[str, str]]:
+        import platform
+
+        if not self.variables:
+            return []
+
+        this_platform = platform.system().lower()
+        audiences = {'users', 'all'}
+
+        replacements = []
+        for var_name, variable in self.variables.to_dict().items():
+            # Path replacement requires bidirectional variables.
+            if variable.get('direction') != 'twoway':
+                continue
+
+            for var_value in variable.get('values', []):
+                if var_value.get('audience') not in audiences:
+                    continue
+                if var_value.get('platform', '').lower() != this_platform:
+                    continue
+
+                replacements.append((var_name, var_value.get('value')))
+        return replacements
+
     def replace_path(self, some_path: pathlib.PurePath) -> str:
         """Performs path variable replacement.
 
@@ -35,7 +77,7 @@ class Manager(List, Find):
         assert isinstance(some_path, pathlib.PurePath), \
             'some_path should be a PurePath, not %r' % some_path
 
-        for varname, path in self._sorted_path_replacements():
+        for varname, path in self._path_replacements():
             replacement = self.PurePlatformPath(path)
             try:
                 relpath = some_path.relative_to(replacement)
@@ -57,7 +99,6 @@ class Job(List, Find, Create):
 
     def patch(self, payload: dict, api=None):
         import pillarsdk.utils
-        import json
 
         api = api or self.api
 

blender_cloud/project_specific.py

@@ -114,7 +114,7 @@ def handle_project_update(_=None, _2=None):
             except TypeError:
                 log.warning('manager %s for this project could not be found', flamenco_manager_id)
         elif prefs.flamenco_manager.available_managers:
-            prefs.flamenco_manager.manager = prefs.flamenco_manager.available_managers[0]
+            prefs.flamenco_manager.manager = prefs.flamenco_manager.available_managers[0]['_id']
 
 
 def store(_=None, _2=None):

blender_cloud/settings_sync.py

@@ -416,11 +416,20 @@ class PILLAR_OT_sync(pillar.PillarOperatorMixin,
         bss = bpy.context.window_manager.blender_sync_status
         bss.available_blender_versions = versions
 
-        if versions:
+        if not versions:
             # There are versions to sync, so we can remove the status message.
             # However, if there aren't any, the status message shows why, and
             # shouldn't be erased.
-            self.bss_report({'INFO'}, '')
+            return
+
+        # Prevent warnings that the current value of the EnumProperty isn't valid.
+        current_version = '%d.%d' % bpy.app.version[:2]
+        if current_version in versions:
+            bss.version = current_version
+        else:
+            bss.version = versions[0]
+
+        self.bss_report({'INFO'}, '')
 
     async def download_settings_file(self, fname: str, temp_dir: str):
         config_dir = pathlib.Path(bpy.utils.user_resource('CONFIG'))

blender_cloud/texture_browser/draw.py

@@ -105,3 +105,8 @@ def bind_texture(texture: bpy.types.Image):
     """Bind a Blender image to a GL texture slot."""
     bgl.glActiveTexture(bgl.GL_TEXTURE0)
     bgl.glBindTexture(bgl.GL_TEXTURE_2D, texture.bindcode)
+
+
+def load_texture(texture: bpy.types.Image) -> int:
+    """Load the texture, return OpenGL error code."""
+    return texture.gl_load()

blender_cloud/texture_browser/draw_27.py

@@ -88,3 +88,8 @@ def aabox_with_texture(v1: Float2, v2: Float2):
 def bind_texture(texture: bpy.types.Image):
     """Bind a Blender image to a GL texture slot."""
     bgl.glBindTexture(bgl.GL_TEXTURE_2D, texture.bindcode[0])
+
+
+def load_texture(texture: bpy.types.Image) -> int:
+    """Load the texture, return OpenGL error code."""
+    return texture.gl_load(filter=bgl.GL_NEAREST, mag=bgl.GL_NEAREST)

blender_cloud/texture_browser/menu_item.py

@@ -164,7 +164,7 @@ class MenuItem:
 
         texture = self.icon
         if texture:
-            err = texture.gl_load(filter=bgl.GL_NEAREST, mag=bgl.GL_NEAREST)
+            err = draw.load_texture(texture)
             assert not err, 'OpenGL error: %i' % err
 
         # ------ TEXTURE ---------#

requirements.txt

@@ -1,9 +1,9 @@
 # Primary requirements:
 -e git+https://github.com/sybrenstuvel/cachecontrol.git@sybren-filecache-delete-crash-fix#egg=CacheControl
 lockfile==0.12.2
-pillarsdk==1.7.0
+pillarsdk==1.8.0
 wheel==0.29.0
-blender-asset-tracer==1.1
+blender-asset-tracer==1.1.1
 
 # Secondary requirements:
 asn1crypto==0.24.0

setup.py

@@ -123,8 +123,8 @@ class BuildWheels(Command):
         """Downloads a wheel from PyPI and saves it in self.wheels_path."""
 
         subprocess.check_call([
-            'pip', 'download',
-            '--no-deps',
+            sys.executable, '-m', 'pip',
+            'download', '--no-deps',
             '--dest', str(self.wheels_path),
             requirement[0]
         ])
@@ -236,7 +236,7 @@ setup(
               'wheels': BuildWheels},
     name='blender_cloud',
     description='The Blender Cloud addon allows browsing the Blender Cloud from Blender.',
-    version='1.12.0',
+    version='1.13.5',
     author='Sybren A. Stüvel',
     author_email='sybren@stuvel.eu',
     packages=find_packages('.'),

update_version.sh

@@ -19,4 +19,4 @@ echo git commit -m \'Bumped version to $VERSION\' setup.py blender_cloud/__init_
 echo git tag -a version-$VERSION -m \'Tagged version $VERSION\'
 echo
 echo "To build a distribution ZIP:"
-echo python setup.py bdist
+echo python3 setup.py bdist