ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/bsdf.c

Comparing ray/src/common/bsdf.c (file contents):
Revision 2.51 by greg, Sat Aug 1 23:27:04 2015 UTC vs.
Revision 2.53 by greg, Thu Feb 2 04:46:38 2017 UTC

#	Line 422 | Line 422 | SDcacheFile(const char *fname)
422		if (fname == NULL || !*fname)
423		return NULL;
424		SDerrorDetail[0] = '\0';
425	+	/* PLACE MUTEX LOCK HERE FOR THREAD-SAFE */
426		if ((sd = SDgetCache(fname)) == NULL) {
427		SDreportError(SDEmemory, stderr);
428		return NULL;
#	Line 429 | Line 430 | SDcacheFile(const char *fname)
430		if (!SDisLoaded(sd) && (ec = SDloadFile(sd, fname))) {
431		SDreportError(ec, stderr);
432		SDfreeCache(sd);
433	<	return NULL;
433	>	sd = NULL;
434		}
435	+	/* END MUTEX LOCK */
436		return sd;
437		}
438
#	Line 494 | Line 496 | SDsampComponent(SDValue *sv, FVECT ioVec, double randX
496		sv->cieY = cd->cTotal;
497		if (sv->cieY <= 1e-6) {         /* nothing to sample? */
498		sv->spec = c_dfcolor;
499	<	memset(ioVec, 0, 3*sizeof(double));
499	>	memset(ioVec, 0, sizeof(FVECT));
500		return SDEnone;
501		}
502		/* compute sample direction */
#	Line 768 | Line 770 | SDsampBSDF(SDValue *sv, FVECT ioVec, double randX, int
770		}
771		if (sv->cieY <= 1e-6) {         /* anything to sample? */
772		sv->cieY = .0;
773	<	memset(ioVec, 0, 3*sizeof(double));
773	>	memset(ioVec, 0, sizeof(FVECT));
774		return SDEnone;
775		}
776		/* scale random variable */

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)