Support for Blender versions 2.73 up to 2.75 (fixes #102)

indyjo · Jul 19, 2015 · 5e9cbc7 · 5e9cbc7
1 parent ece1d4d
commit 5e9cbc7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/bitwrk-blender/blender-slave.py b/bitwrk-blender/blender-slave.py
@@ -390,10 +390,16 @@ def get_blender_version():
         return "2.71"
     elif b"Blender 2.72 (sub 0)" in output:
         return "2.72"
+    elif b"Blender 2.73 (sub 0)" in output:
+        return "2.73"
+    elif b"Blender 2.74 (sub 0)" in output:
+        return "2.74"
+    elif b"Blender 2.75 (sub 0)" in output:
+        return "2.75"
     else:
         raise RuntimeError("Blender version could not be detected.\n"
                            + "This version of blender-slave.py will detect Blender versions "
-                           + "2.69 up to 2.72.")
+                           + "2.69 up to 2.75.")
 
 
 def parse_args():

diff --git a/bitwrk-blender/render_bitwrk.py b/bitwrk-blender/render_bitwrk.py
@@ -392,7 +392,7 @@ def dispatch(self, settings, data, filepath, engine):
         """ 
         # draw rect in preview color
         tile = engine.begin_result(self.minx, self.miny, self.resx, self.resy)
-        tile.layers[0].rect = [self.color] * (self.resx*self.resy)
+        tile.layers[0].passes[0].rect = [self.color] * (self.resx*self.resy)
         engine.end_result(tile)
 
         self.result = engine.begin_result(self.minx, self.miny, self.resx, self.resy)
@@ -422,7 +422,7 @@ def dispatch(self, settings, data, filepath, engine):
             engine.report({'ERROR'}, "Exception in dispatch: {}".format(traceback.format_exc()))
             self.conn.close()
             self.conn = None
-            self.result.layers[0].rect = [[1,0,0,1]] * (self.resx*self.resy)
+            self.result.layers[0].passes[0].rect = [[1,0,0,1]] * (self.resx*self.resy)
             engine.end_result(self.result)
             self.result = None
             return False
@@ -463,7 +463,7 @@ def collect(self, settings, engine, is_multilayer):
         except:
             print("Exception in collect:", sys.exc_info())
             engine.report({'WARNING'}, "Exception in collect: {}".format(traceback.format_exc()))
-            self.result.layers[0].rect = [[1,0,0,1]] * (self.resx*self.resy)
+            self.result.layers[0].passes[0].rect = [[1,0,0,1]] * (self.resx*self.resy)
             engine.end_result(self.result)
             self.result = None
         finally: