ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/rtmain.c
(Generate patch)

Comparing ray/src/rt/rtmain.c (file contents):
Revision 2.55 by greg, Wed Aug 21 20:42:20 2024 UTC vs.
Revision 2.58 by greg, Tue Apr 22 17:12:25 2025 UTC

# Line 13 | Line 13 | static const char      RCSid[] = "$Id$";
13   #include  "rtprocess.h" /* getpid() */
14   #include  "resolu.h"
15   #include  "ray.h"
16 + #include  "func.h"
17   #include  "source.h"
18   #include  "ambient.h"
19   #include  "random.h"
# Line 114 | Line 115 | main(int  argc, char  *argv[])
115          strcat(RFeatureList, RTRACE_FEATURES);
116          if (argc > 1 && !strcmp(argv[1], "-features"))
117                  return feature_status(argc-2, argv+2);
118 +                                        /* initialize calcomp routines */
119 +        initfunc();
120                                          /* add trace notify function */
121          for (i = 0; addobjnotify[i] != NULL; i++)
122                  ;
# Line 348 | Line 351 | main(int  argc, char  *argv[])
351          rval = setspectrsamp(CNDX, WLPART);
352          if (rval < 0)
353                  error(USER, "unsupported spectral sampling");
354 <        if (out_prims != NULL) {
354 >        if (sens_curve != NULL)
355 >                out_prims = NULL;
356 >        else if (out_prims != NULL) {
357                  if (!rval)
358                          error(WARNING, "spectral range incompatible with color output");
359          } else if (NCSAMP == 3)
# Line 508 | Line 513 | wputs(                         /* warning output function */
513   )
514   {
515          int  lasterrno = errno;
516 +        if (erract[WARNING].pf == NULL)
517 +                return;         /* called by calcomp or someone */
518          eputs(s);
519          errno = lasterrno;
520   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines