[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3599] trunk/py/scripts/tools/bi_farm: workaround for cycles, set x/y tiles to 1

[Campbell Barton]

Revision: 3599
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3599
Author:   campbellbarton
Date:     2012-07-09 09:36:41 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
workaround for cycles, set x/y tiles to 1

Modified Paths:
--------------
    trunk/py/scripts/tools/bi_farm/master_avi_gen__loop.sh
    trunk/py/scripts/tools/bi_farm/new_blender_setup.py

Modified: trunk/py/scripts/tools/bi_farm/master_avi_gen__loop.sh
===================================================================
--- trunk/py/scripts/tools/bi_farm/master_avi_gen__loop.sh	2012-07-09 09:17:41 UTC (rev 3598)
+++ trunk/py/scripts/tools/bi_farm/master_avi_gen__loop.sh	2012-07-09 09:36:41 UTC (rev 3599)
@@ -1,7 +1,7 @@
 #!/bin/bash
 # simply call: 'master_avi_gen.py' in a loop
 while true; do
-	svn up ./mango_svn
+	svn up ./mango_svn --accept theirs-full
 	./master_avi_gen.py
 	sleep 120
 done
\ No newline at end of file

Modified: trunk/py/scripts/tools/bi_farm/new_blender_setup.py
===================================================================
--- trunk/py/scripts/tools/bi_farm/new_blender_setup.py	2012-07-09 09:17:41 UTC (rev 3598)
+++ trunk/py/scripts/tools/bi_farm/new_blender_setup.py	2012-07-09 09:36:41 UTC (rev 3599)
@@ -166,6 +166,8 @@
             scene.cycles.device = 'CPU'
         elif processor == 'CUDA':
             scene.cycles.device = 'GPU'
+            # XXX, WORKAROUND FOR CYCLES
+            rd.parts_x = rd.parts_y = 1
         else:
             assert(0)