--- ray/src/util/rmatrix.c 2015/05/04 20:53:21 2.13 +++ ray/src/util/rmatrix.c 2015/05/08 18:25:03 2.15 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rmatrix.c,v 2.13 2015/05/04 20:53:21 greg Exp $"; +static const char RCSid[] = "$Id: rmatrix.c,v 2.15 2015/05/08 18:25:03 greg Exp $"; #endif /* * General matrix operations. @@ -10,6 +10,7 @@ static const char RCSid[] = "$Id: rmatrix.c,v 2.13 201 #include #include #include "resolu.h" +#include "rtprocess.h" #include "rmatrix.h" static char rmx_mismatch_warn[] = "WARNING: data type mismatch\n"; @@ -46,7 +47,9 @@ rmx_free(RMATRIX *rm) int rmx_newtype(int dtyp1, int dtyp2) { - if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) && dtyp1 != dtyp2) + if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) | + (dtyp2==DTxyze) | (dtyp2==DTrgbe) + && dtyp1 != dtyp2) return(0); if (dtyp1 < dtyp2) return(dtyp1);