[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3155] trunk/py/scripts/addons/ render_renderfarmfi.py: Some updates in preparation for Cycles public usage release on the farm.

[Nathan Letwory]

Revision: 3155
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3155
Author:   jesterking
Date:     2012-03-22 14:10:27 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
Some updates in preparation for Cycles public usage release on the farm.

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 02:20:27 UTC (rev 3154)
+++ trunk/py/scripts/addons/render_renderfarmfi.py	2012-03-22 14:10:27 UTC (rev 3155)
@@ -21,7 +21,7 @@
 bl_info = {
     "name": "Renderfarm.fi",
     "author": "Nathan Letwory <nathan at letworyinteractive.com>, Jesse Kaukonen <jesse.kaukonen at gmail.com>",
-    "version": (16,),
+    "version": (17,),
     "blender": (2, 6, 2),
     "location": "Render > Engine > Renderfarm.fi",
     "description": "Send .blend as session to http://www.renderfarm.fi to render",
@@ -88,10 +88,10 @@
 bpy.file_format_warning = False
 bpy.ready = False
 
-if False and DEV:
-    rffi_xmlrpc_secure = r'http://192.168.0.109/burp/xmlrpc'
-    rffi_xmlrpc = r'http://192.168.0.109/burp/xmlrpc'
-    rffi_xmlrpc_upload = '192.168.0.109'
+if True: #DEV:
+    rffi_xmlrpc_secure = r'http://renderfarm.local/burp/xmlrpc'
+    rffi_xmlrpc = r'http://renderfarm.local/burp/xmlrpc'
+    rffi_xmlrpc_upload = 'renderfarm.local'
 else:
     rffi_xmlrpc_secure = r'https://xmlrpc.renderfarm.fi/burp/xmlrpc'
     rffi_xmlrpc = r'http://xmlrpc.renderfarm.fi/burp/xmlrpc'
@@ -126,6 +126,7 @@
     url = StringProperty(name='Project URL', description='Project URL. Leave empty if not applicable', maxlen=256, default='')
     engine = StringProperty(name='Engine', description='The rendering engine that is used for rendering', maxlen=64, default='blender')
     samples = IntProperty(name='Samples', description='Number of samples that is used (Cycles only)', min=1, max=1000000, soft_min=1, soft_max=100000, default=100)
+    subsamples = IntProperty(name='Subsample Frames', description='Number of subsample frames that is used (Cycles only)', min=1, max=1000000, soft_min=1, soft_max=1000, default=10)
     file_format = StringProperty(name='File format', description='File format used for the rendering', maxlen=20, default='PNG_FORMAT')
     
     parts = IntProperty(name='Parts/Frame', description='', min=1, max=1000, soft_min=1, soft_max=64, default=1)
@@ -544,6 +545,7 @@
             row = layout.row()
             if (ore.engine == 'cycles'):
                 row.prop(ore, 'samples')
+                row.prop(ore, 'subsamples')
             row = layout.row()
             row.prop(ore, 'memusage')
             #row.prop(ore, 'parts')
@@ -765,8 +767,11 @@
         res = proxy.session.setFrameFormat(userid, res['key'], sessionid, ore.file_format)
         res = proxy.session.setRenderer(userid, res['key'], sessionid, ore.engine)
         res = proxy.session.setSamples(userid, res['key'], sessionid, ore.samples)
+        res = proxy.session.setSubSamples(userid, res['key'], sessionid, ore.subsamples)
         if (ore.engine == 'cycles'):
             res = proxy.session.setReplication(userid, res['key'], sessionid, 1)
+            if ore.subsamples > 1:
+                res = proxy.session.setStitcher(userid, res['key'], sessionid, 'AVERAGE')
         else:
             res = proxy.session.setReplication(userid, res['key'], sessionid, 3)
         res = proxy.session.setOutputLicense(userid, res['key'], sessionid, int(ore.outlicense))
@@ -1056,6 +1061,9 @@
     def execute(self, context):
         sce = context.scene
         ore = sce.ore_render
+
+        ore.password = ore.password.strip()
+        ore.username = ore.username.strip().lower()
         
         if ore.hash=='':
             if ore.password != '' and ore.username != '':