DistRen Changeset - 1484d8dbad43 · protofusion repositories

Changeset - 1484d8dbad43

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Ethan Zonca (ethanzonca) - 15 years ago 2010-09-13 17:06:01
e@ethanzonca.com

Fixed slave.c

1 file changed with 3 insertions and 1 deletions:

src/server/slave.c

0 comments (0 inline, 0 general)

src/server/slave.c

➞

Show inline comments

@@ @@ -168,12 +168,14 @@ int main(int argc, char *argv[]) @@
       return 1;
+    }
   // Variables needed for main loop
   int jobnum = 0;
   int framenum = 0;
   int xres = 0;
   int yres = 0;
   int slavekey = atoi(username); // @TODO: Make this more friendly
   char *urltoTar;      /* Full URL to the server-side location of job#.tgz */
   char *pathtoTar;     /* Full path to the location of the job#.tgz */
   char *pathtoTardir;
@@ @@ -294,13 +296,13 @@ int main(int argc, char *argv[]) @@
         if(DEBUG){
           fprintf(stderr,"Executing blender on file %s\n", pathtoJobfile);
           fprintf(stderr,"Directing output to file %s\n", pathtoOutput);
+        }
         /* Execute blender */
         if(exec_blender(pathtoJobfile, pathtoOutput, framenum))
+        if(exec_blender(pathtoJobfile, pathtoOutput, outputExt, xres, yres, framenum))
+          {
             fprintf(stderr,"Error running Blender. Check your installation and/or your PATH.\n");
             resetframe(slave_state.rem, jobnum, framenum);  // Unassign the frame on the server so other slaves can render it
             return 1;
+          }
         free(pathtoJobfile);

0 comments (0 inline, 0 general)