[Bf-extensions-cvs] [4e47d33] temp-blend-utils: Fixed indent error in subprocess helper

Campbell Barton noreply at git.blender.org
Thu Jan 28 14:12:09 CET 2016


Commit: 4e47d337ed04f316dada736cad9e7f0787622109
Author: Campbell Barton
Date:   Thu Jan 28 23:57:54 2016 +1100
Branches: temp-blend-utils
https://developer.blender.org/rBA4e47d337ed04f316dada736cad9e7f0787622109

Fixed indent error in subprocess helper

Also other minor changes

===================================================================

M	io_blend_utils/__init__.py
M	io_blend_utils/bl_utils/subprocess_helper.py
M	io_blend_utils/blend/blendfile_path_walker.py

===================================================================

diff --git a/io_blend_utils/__init__.py b/io_blend_utils/__init__.py
index 8726693..5eb8a67 100644
--- a/io_blend_utils/__init__.py
+++ b/io_blend_utils/__init__.py
@@ -42,8 +42,11 @@ class ExportBlendPack(Operator, ExportHelper, SubprocessHelper):
     bl_idname = "export_blend.pack"
     bl_label = "Pack Blend to Archive"
 
+    # ExportHelper
     filename_ext = ".zip"
 
+    # SubprocessHelper
+
     @classmethod
     def poll(cls, context):
         return bpy.data.is_saved
@@ -65,7 +68,7 @@ class ExportBlendPack(Operator, ExportHelper, SubprocessHelper):
 def menu_func(self, context):
     layout = self.layout
     layout.separator()
-    layout.operator(ExportBlendPack.bl_idname, icon='MESH_CUBE')
+    layout.operator(ExportBlendPack.bl_idname)
 
 
 classes = (
diff --git a/io_blend_utils/bl_utils/subprocess_helper.py b/io_blend_utils/bl_utils/subprocess_helper.py
index 760f69d..3a59b70 100644
--- a/io_blend_utils/bl_utils/subprocess_helper.py
+++ b/io_blend_utils/bl_utils/subprocess_helper.py
@@ -70,15 +70,15 @@ class SubprocessHelper:
                 yield b''
                 continue
 
-                while True:
-                    n = data.find(b'\n')
-                    if n == -1:
-                        break
+            while True:
+                n = data.find(b'\n')
+                if n == -1:
+                    break
 
-                    yield b''.join(blocks) + data[:n + 1]
-                    data = data[n + 1:]
-                    blocks.clear()
-                blocks.append(data)
+                yield b''.join(blocks) + data[:n + 1]
+                data = data[n + 1:]
+                blocks.clear()
+            blocks.append(data)
 
     def _report_output(self):
         stdout_line_iter, stderr_line_iter = self._buffer_iter
@@ -96,8 +96,8 @@ class SubprocessHelper:
         wm = context.window_manager
         window = context.window
 
-        self._timer = wm.event_timer_add(0.1, context.window)
-        context.window.cursor_set('WAIT')
+        self._timer = wm.event_timer_add(0.25, window)
+        window.cursor_set('WAIT')
 
     def _wm_exit(self, context):
         wm = context.window_manager
diff --git a/io_blend_utils/blend/blendfile_path_walker.py b/io_blend_utils/blend/blendfile_path_walker.py
index 163d468..9c6c800 100644
--- a/io_blend_utils/blend/blendfile_path_walker.py
+++ b/io_blend_utils/blend/blendfile_path_walker.py
@@ -23,7 +23,7 @@ import os
 VERBOSE = False  # os.environ.get('BAM_VERBOSE', False)
 TIMEIT = False
 
-USE_ALEMBIC_BRANCH = True
+USE_ALEMBIC_BRANCH = False
 
 
 class C_defs:



More information about the Bf-extensions-cvs mailing list