--- ray/src/util/dctimestep.c 2014/01/20 21:29:04 2.28 +++ ray/src/util/dctimestep.c 2014/01/20 22:18:29 2.29 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: dctimestep.c,v 2.28 2014/01/20 21:29:04 greg Exp $"; +static const char RCSid[] = "$Id: dctimestep.c,v 2.29 2014/01/20 22:18:29 greg Exp $"; #endif /* * Compute time-step result using Daylight Coefficient method. @@ -164,23 +164,18 @@ main(int argc, char *argv[]) if (argc-a > 2) { /* VTDs expression */ CMATRIX *smtx, *Dmat, *Tmat, *imtx; - COLOR tLamb; /* get sky vector/matrix */ smtx = cm_load(argv[a+3], 0, nsteps, skyfmt); /* load BSDF */ - Tmat = cm_loadBSDF(argv[a+1], tLamb); + Tmat = cm_loadBTDF(argv[a+1]); /* load Daylight matrix */ Dmat = cm_load(argv[a+2], Tmat==NULL ? 0 : Tmat->ncols, smtx->nrows, DTfromHeader); /* multiply vector through */ imtx = cm_multiply(Dmat, smtx); cm_free(Dmat); cm_free(smtx); - if (Tmat == NULL) { /* diffuse only */ - cmtx = cm_scale(imtx, tLamb); - } else { /* else apply BTDF matrix */ - cmtx = cm_multiply(Tmat, imtx); - cm_free(Tmat); - } + cmtx = cm_multiply(Tmat, imtx); + cm_free(Tmat); cm_free(imtx); } else { /* sky vector/matrix only */ cmtx = cm_load(argv[a+1], 0, nsteps, skyfmt);