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

Comparing ray/src/util/rmatrix.c (file contents):
Revision 2.13 by greg, Mon May 4 20:53:21 2015 UTC vs.
Revision 2.14 by greg, Mon May 4 23:27:04 2015 UTC

# Line 46 | Line 46 | rmx_free(RMATRIX *rm)
46   int
47   rmx_newtype(int dtyp1, int dtyp2)
48   {
49 <        if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) && dtyp1 != dtyp2)
49 >        if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) |
50 >                        (dtyp2==DTxyze) | (dtyp2==DTrgbe)
51 >                        && dtyp1 != dtyp2)
52                  return(0);
53          if (dtyp1 < dtyp2)
54                  return(dtyp1);

Diff Legend

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