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

Comparing ray/src/util/rmtxcomb.c (file contents):
Revision 2.5 by greg, Fri Dec 8 00:12:31 2023 UTC vs.
Revision 2.6 by greg, Mon Dec 11 15:13:39 2023 UTC

# Line 563 | Line 563 | combine_input(ROPMAT *res, FILE *fout)
563                  scompile("co(p)=select(p,ro,go,bo)", NULL, 0);
564                  co_set = 1;
565          }
566 <        if (co_set) {                   /* don't override user */
567 <                set_r = !vardefined("r");
568 <                set_c = !vardefined("c");
566 >        if (co_set) {                   /* set if user wants, didn't set */
567 >                set_r = varlookup("r") != NULL && !vardefined("r");
568 >                set_c = varlookup("c") != NULL && !vardefined("c");
569          } else                          /* save a little time */
570                  set_r = set_c = 0;
571                                          /* read/process row-by-row */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines