Bumped version to 1.6.1

Thanks to dr. Sharybin for the patch.

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, 5, 999999),
+    'version': (1, 6, 1),
     'blender': (2, 77, 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/blender.py

@@ -390,9 +390,13 @@ class BlenderCloudPreferences(AddonPreferences):
 
         path_box = job_output_box.row(align=True)
         output_path = render_output_path(context)
-        path_box.label(str(output_path))
-        props = path_box.operator('flamenco.explore_file_path', text='', icon='DISK_DRIVE')
-        props.path = str(output_path.parent)
+        if output_path:
+            path_box.label(str(output_path))
+            props = path_box.operator('flamenco.explore_file_path', text='', icon='DISK_DRIVE')
+            props.path = str(output_path.parent)
+        else:
+            path_box.label('Blend file is not in your project path, '
+                           'unable to give output path example.')
 
         flamenco_box.prop(self, 'flamenco_open_browser_after_submit')
 

blender_cloud/flamenco/__init__.py

@@ -128,24 +128,13 @@ class FLAMENCO_OT_render(async_loop.AsyncModalOperatorMixin,
         if not await self.authenticate(context):
             return
 
-        from pillarsdk import exceptions as sdk_exceptions
         from ..blender import preferences
 
         scene = context.scene
 
-        # The file extension should be determined by the render settings, not necessarily
-        # by the setttings in the output panel.
-        scene.render.use_file_extension = True
-
-        # Save to a different file, specifically for Flamenco. We shouldn't overwrite
-        # the artist's file. We can compress, since this file won't be managed by SVN
-        # and doesn't need diffability.
+        # Save to a different file, specifically for Flamenco.
         context.window_manager.flamenco_status = 'PACKING'
-        filepath = Path(context.blend_data.filepath).with_suffix('.flamenco.blend')
-        self.log.info('Saving copy to temporary file %s', filepath)
-        bpy.ops.wm.save_as_mainfile(filepath=str(filepath),
-                                    compress=True,
-                                    copy=True)
+        filepath = await self._save_blendfile(context)
 
         # Determine where the render output will be stored.
         render_output = render_output_path(context, filepath)
@@ -173,7 +162,11 @@ class FLAMENCO_OT_render(async_loop.AsyncModalOperatorMixin,
 
         # Add extra settings specific to the job type
         if scene.flamenco_render_job_type == 'blender-render-progressive':
-            samples = scene.cycles.samples
+            if scene.cycles.progressive == 'BRANCHED_PATH':
+                samples = scene.cycles.aa_samples
+            else:
+                samples = scene.cycles.samples
+
             if scene.cycles.use_square_samples:
                 samples **= 2
 
@@ -230,6 +223,43 @@ class FLAMENCO_OT_render(async_loop.AsyncModalOperatorMixin,
 
         self.quit()
 
+    async def _save_blendfile(self, context):
+        """Save to a different file, specifically for Flamenco.
+
+        We shouldn't overwrite the artist's file.
+        We can compress, since this file won't be managed by SVN and doesn't need diffability.
+        """
+
+        render = context.scene.render
+
+        # Remember settings we need to restore after saving.
+        old_use_file_extension = render.use_file_extension
+        old_use_overwrite = render.use_overwrite
+        old_use_placeholder = render.use_placeholder
+
+        try:
+
+            # The file extension should be determined by the render settings, not necessarily
+            # by the setttings in the output panel.
+            render.use_file_extension = True
+
+            # Rescheduling should not overwrite existing frames.
+            render.use_overwrite = False
+            render.use_placeholder = False
+
+            filepath = Path(context.blend_data.filepath).with_suffix('.flamenco.blend')
+            self.log.info('Saving copy to temporary file %s', filepath)
+            bpy.ops.wm.save_as_mainfile(filepath=str(filepath),
+                                        compress=True,
+                                        copy=True)
+        finally:
+            # Restore the settings we changed, even after an exception.
+            render.use_file_extension = old_use_file_extension
+            render.use_overwrite = old_use_overwrite
+            render.use_placeholder = old_use_placeholder
+
+        return filepath
+
     def quit(self):
         super().quit()
         bpy.context.window_manager.flamenco_status = 'IDLE'
@@ -406,7 +436,11 @@ def _render_output_path(
     is fast.
     """
 
-    project_path = Path(bpy.path.abspath(local_project_path)).resolve()
+    try:
+        project_path = Path(bpy.path.abspath(local_project_path)).resolve()
+    except FileNotFoundError:
+        # Path.resolve() will raise a FileNotFoundError if the project path doesn't exist.
+        return None
 
     try:
         proj_rel = blend_filepath.parent.relative_to(project_path)
@@ -521,11 +555,6 @@ class FLAMENCO_PT_render(bpy.types.Panel):
             else:
                 layout.label('Unknown Flamenco status %s' % flamenco_status)
 
-        if not context.scene.render.use_overwrite:
-            warnbox = layout.box().column(align=True)
-            warnbox.label('Please enable "Overwrite" in the Output panel,')
-            warnbox.label('or re-queueing this job might not do anything.')
-
 
 def register():
     from ..utils import redraw
@@ -543,7 +572,7 @@ def register():
         name='Frame Chunk Size',
         description='Maximum number of frames to render per task',
         min=1,
-        default=10,
+        default=1,
     )
     scene.flamenco_render_schunk_count = IntProperty(
         name='Number of Sample Chunks',

blender_cloud/pillar.py

@@ -860,6 +860,13 @@ class AuthenticatedPillarOperatorMixin(PillarOperatorMixin):
             self.report({'ERROR'}, 'Please log in on Blender ID first.')
             self.quit()
             return False
+        except requests.exceptions.ConnectionError:
+            self.log.exception('Error checking pillar credentials.')
+            self.report({'ERROR'}, 'Unable to connect to Blender Cloud, '
+                                   'check your internet connection.')
+            self.quit()
+            return False
+
 
         self.user_id = self.db_user['_id']
         return True

setup.py

@@ -227,7 +227,7 @@ setup(
               'wheels': BuildWheels},
     name='blender_cloud',
     description='The Blender Cloud addon allows browsing the Blender Cloud from Blender.',
-    version='1.5.999999',
+    version='1.6.1',
     author='Sybren A. Stüvel',
     author_email='sybren@stuvel.eu',
     packages=find_packages('.'),