ViewVC Help

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

root/Development/ray/doc/ray.html

Comparing ray/doc/ray.html (file contents):
Revision 1.21 by greg, Fri Sep 25 23:01:12 2015 UTC vs.
Revision 1.22 by greg, Tue Dec 1 16:58:16 2015 UTC

#	Line 1415 | Line 1415 | or:
1415		</h4>
1416
1417		A mixture is a blend of one or more materials or textures and patterns.
1418	+	Blended materials should not be light source types or virtual source types.
1419		The basic types are given below.
1420
1421		<p>
#	Line 1487 | Line 1488 | A mixfunc mixes  two  modifiers  procedurally.   It  i
1488		arguments, the red, green and blue values
1489		corresponding to the pixel at (u,v).
1490
1490	–	</dl>
1491		<p>
1492
1493		<dt>

Diff Legend

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