[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31011] branches/soc-2010-leifandersen/ tests/render/run.py: Fixed the arguement count for animations.

[Leif Andersen]

Revision: 31011
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31011
Author:   leifandersen
Date:     2010-08-03 19:24:05 +0200 (Tue, 03 Aug 2010)

Log Message:
-----------
Fixed the arguement count for animations.

Modified Paths:
--------------
    branches/soc-2010-leifandersen/tests/render/run.py

Modified: branches/soc-2010-leifandersen/tests/render/run.py
===================================================================
--- branches/soc-2010-leifandersen/tests/render/run.py	2010-08-03 17:20:18 UTC (rev 31010)
+++ branches/soc-2010-leifandersen/tests/render/run.py	2010-08-03 17:24:05 UTC (rev 31011)
@@ -228,7 +228,7 @@
             self.passed = False
             return (good_image, test_image, diff_image)
 
-    def render_test(self, good_blender_bin, blender_bin, verbose):
+    def render_test(self, good_blender_bin, blender_bin, verbose, render_good):
         '''Renders the test animation based on the given animation path in the setup methods.
            Assumes there is a global VERBOSE and BLENDER_BIN variable to be used.
            Will only render the first frame of the image using the default settings (saving as a PNG though)
@@ -236,14 +236,16 @@
            
         # Render depending on the verbosity needed
         if verbose:
-            command = good_blender_bin + ' -b ' + self.blend_path + " -o " + os.path.join(self.good_path,string.replace(self.name,'.blend','_####')) + ' -F PNG -x 1 -j 30 -a'
-            os.system(command)
+            if render_good:
+                command = good_blender_bin + ' -b ' + self.blend_path + " -o " + os.path.join(self.good_path,string.replace(self.name,'.blend','_####')) + ' -F PNG -x 1 -j 30 -a'
+                os.system(command)
             command = blender_bin + ' -b ' + self.blend_path + " -o " + os.path.join(self.test_path,string.replace(self.name,'.blend','_####')) + ' -F PNG -x 1 -j 30 -a'
             os.system(command)
         else:
-            p = Popen([good_blender_bin, '-b', self.blend_path, '-o', os.path.join(self.good_path,string.replace(self.name,'.blend','_####')), '-F', 'PNG', '-x', '1', '-j', '30', '-a'], stdout=None, stderr=None, stdin=None)
+            if render_good:
+                p = Popen([good_blender_bin, '-b', self.blend_path, '-o', os.path.join(self.good_path,string.replace(self.name,'.blend','_####')), '-F', 'PNG', '-x', '1', '-j', '30', '-a'], stdout=None, stderr=None, stdin=None)
+                p.wait()
             q = Popen([blender_bin, '-b', self.blend_path, '-o', os.path.join(self.test_path,string.replace(self.name,'.blend','_####')), '-F', 'PNG', '-x', '1', '-j', '30', '-a'], stdout=None, stderr=None, stdin=None)
-            p.wait()
             q.wait()
             
         # Modify self.test_path for later use