ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/hd/rholo2.c
(Generate patch)

Comparing ray/src/hd/rholo2.c (file contents):
Revision 3.10 by gregl, Thu Dec 18 09:33:35 1997 UTC vs.
Revision 3.13 by gwlarson, Mon Jul 6 18:17:20 1998 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1997 Silicon Graphics, Inc. */
1 > /* Copyright (c) 1998 Silicon Graphics, Inc. */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ SGI";
# Line 115 | Line 115 | new_rtrace()                   /* restart rtrace calculation */
115  
116   getradfile()                    /* run rad and get needed variables */
117   {
118 <        static short    mvar[] = {OCTREE,-1};
118 >        static short    mvar[] = {OCTREE,EYESEP,-1};
119          static char     tf1[] = TEMPLATE;
120          char    tf2[64];
121          char    combuf[256];
# Line 124 | Line 124 | getradfile()                   /* run rad and get needed variables */
124          register char   *cp;
125                                          /* check if rad file specified */
126          if (!vdef(RIF))
127 <                return;
127 >                return(0);
128                                          /* create rad command */
129          mktemp(tf1);
130          sprintf(tf2, "%s.rif", tf1);
# Line 147 | Line 147 | getradfile()                   /* run rad and get needed variables */
147                  strcpy(pippt, "> /dev/null");   /* nothing to match */
148          else
149                  sprintf(cp, ")[ \t]*=' > %s", tf2);
150 <        if (system(combuf)) {
151 <                unlink(tf2);                    /* clean up */
152 <                unlink(tf1);
153 <                error(USER, "error executing rad command");
154 <        }
150 > #ifdef DEBUG
151 >        wputs(combuf); wputs("\n");
152 > #endif
153 >        system(combuf);                         /* ignore exit code */
154          if (pippt == NULL) {
155                  loadvars(tf2);                  /* load variables */
156                  unlink(tf2);
157          }
158          rtargc += wordfile(rtargv+rtargc, tf1); /* get rtrace options */
159          unlink(tf1);                    /* clean up */
160 +        return(1);
161   }
162  
163  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)