[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3159] trunk/py/scripts/addons/ render_renderfarmfi.py: - Editing subsamples so that they cannot cause workunits smaller than 100 samples

[Jesse Kaukonen]

Revision: 3159
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3159
Author:   gekko
Date:     2012-03-22 14:58:43 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
- Editing subsamples so that they cannot cause workunits smaller than 100 samples
- Changing setting copying so that they are updated before saving the file, and are correct if edited without going back to Blender render panel

Modified Paths:
--------------
    trunk/py/scripts/addons/render_renderfarmfi.py

Modified: trunk/py/scripts/addons/render_renderfarmfi.py
===================================================================
--- trunk/py/scripts/addons/render_renderfarmfi.py	2012-03-22 14:22:26 UTC (rev 3158)
+++ trunk/py/scripts/addons/render_renderfarmfi.py	2012-03-22 14:58:43 UTC (rev 3159)
@@ -21,7 +21,7 @@
 bl_info = {
     "name": "Renderfarm.fi",
     "author": "Nathan Letwory <nathan at letworyinteractive.com>, Jesse Kaukonen <jesse.kaukonen at gmail.com>",
-    "version": (17,),
+    "version": (18,),
     "blender": (2, 6, 2),
     "location": "Render > Engine > Renderfarm.fi",
     "description": "Send .blend as session to http://www.renderfarm.fi to render",
@@ -241,13 +241,13 @@
     sce = bpy.context.scene
     rd = sce.render
     ore = sce.ore_render
-    
+
     # Necessary settings for BURP
-    ore.resox = rd.resolution_x
-    ore.resoy = rd.resolution_y
-    ore.start = sce.frame_start
-    ore.end = sce.frame_end
-    ore.fps = rd.fps
+    rd.resolution_x = ore.resox
+    rd.resolution_y = ore.resoy
+    sce.frame_start = ore.start
+    sce.frame_end = ore.end
+    rd.fps = ore.fps
     
     bpy.file_format_warning = False
     bpy.simulationWarning = False
@@ -272,8 +272,14 @@
         ore.file_format = 'PNG_FORMAT'
         
     if (ore.engine == 'cycles'):
-        ore.samples = bpy.context.scene.cycles.samples
+        bpy.context.scene.cycles.samples = ore.samples
         
+    if (ore.subsamples <= 0):
+        ore.subsamples = 1
+    
+    if (ore.samples / ore.subsamples < 100.0):
+        ore.subsamples = float(ore.samples) / 100.0
+        
     # Multipart support doesn' work if SSS is used
     if ((rd.use_sss == True and hasSSSMaterial()) and ore.parts > 1):
         ore.parts = 1;
@@ -295,13 +301,7 @@
     ore = sce.ore_render
     
     changeSettings()
-    
-    ore.resox = rd.resolution_x
-    ore.resoy = rd.resolution_y
-    ore.fps = rd.fps
-    ore.start = sce.frame_start
-    ore.end = sce.frame_end
-    
+
     print("Packing external textures...")
     try:
         bpy.ops.file.pack_all()
@@ -349,11 +349,19 @@
     bl_idname = "ore.switch_to_renderfarm_render"
     
     def execute(self, context):
-        changeSettings()
-        if (bpy.context.scene.render.engine == 'CYCLES'):
-            bpy.context.scene.ore_render.engine = 'cycles'
+        ore = bpy.context.scene.ore_render
+        rd = bpy.context.scene.render
+        
+        ore.resox = rd.resolution_x
+        ore.resoy = rd.resolution_y
+        ore.fps = rd.fps
+        ore.start = bpy.context.scene.frame_start
+        ore.end = bpy.context.scene.frame_end
+        if (rd.engine == 'CYCLES'):
+            ore.samples = bpy.context.scene.cycles.samples
+            ore.engine = 'cycles'
         else:
-            bpy.context.scene.ore_render.engine = 'blender'
+            ore.engine = 'blender'
         bpy.context.scene.render.engine = 'RENDERFARMFI_RENDER'
         return {'FINISHED'}
 
@@ -370,7 +378,8 @@
         bpy.context.scene.frame_start = ore.start
         bpy.context.scene.frame_end = ore.end
         if (bpy.context.scene.ore_render.engine == 'cycles'):
-            bpy.context.scene.render.engine = 'CYCLES'
+            rd.engine = 'CYCLES'
+            bpy.context.scene.cycles.samples = ore.samples
         else:
             bpy.context.scene.render.engine = 'BLENDER_RENDER'
         return {'FINISHED'}