--- ray/src/hd/rholo2.c 1997/12/18 09:33:35 3.10 +++ ray/src/hd/rholo2.c 1998/06/10 17:46:21 3.12 @@ -1,4 +1,4 @@ -/* Copyright (c) 1997 Silicon Graphics, Inc. */ +/* Copyright (c) 1998 Silicon Graphics, Inc. */ #ifndef lint static char SCCSid[] = "$SunId$ SGI"; @@ -115,7 +115,7 @@ new_rtrace() /* restart rtrace calculation */ getradfile() /* run rad and get needed variables */ { - static short mvar[] = {OCTREE,-1}; + static short mvar[] = {OCTREE,EYESEP,-1}; static char tf1[] = TEMPLATE; char tf2[64]; char combuf[256]; @@ -124,7 +124,7 @@ getradfile() /* run rad and get needed variables */ register char *cp; /* check if rad file specified */ if (!vdef(RIF)) - return; + return(0); /* create rad command */ mktemp(tf1); sprintf(tf2, "%s.rif", tf1); @@ -150,7 +150,8 @@ getradfile() /* run rad and get needed variables */ if (system(combuf)) { unlink(tf2); /* clean up */ unlink(tf1); - error(USER, "error executing rad command"); + error(WARNING, "error executing rad command"); + return(-1); } if (pippt == NULL) { loadvars(tf2); /* load variables */ @@ -158,6 +159,7 @@ getradfile() /* run rad and get needed variables */ } rtargc += wordfile(rtargv+rtargc, tf1); /* get rtrace options */ unlink(tf1); /* clean up */ + return(1); }