ViewVC Help

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

root/Development/ray/src/rt/m_alias.c

Comparing ray/src/rt/m_alias.c (file contents):
Revision 2.4 by greg, Tue Jan 20 22:16:53 2004 UTC vs.
Revision 2.6 by greg, Wed Jul 12 05:47:05 2006 UTC

#	Line 6 | Line 6 | static const char RCSid[] = "$Id$";
6		*/
7
8		#include "copyright.h"
9	+
10		#include "ray.h"
11		#include "otypes.h"
12	+	#include "rtotypes.h"
13		#include "otspecial.h"
14
15		/*
#	Line 21 | Line 23 | static const char RCSid[] = "$Id$";
23		*  chain at all.
24		*/
25
26	<	int
27	<	m_alias(m, r)                   /* transfer shading to alias target */
28	<	OBJREC  *m;
29	<	RAY     *r;
26	>	extern int
27	>	m_alias(                        /* transfer shading to alias target */
28	>	OBJREC  *m,
29	>	RAY     *r
30	>	)
31		{
32		OBJECT  aobj;
33		OBJREC  *aop;
#	Line 36 | Line 39 | RAY    *r;
39		/* else replace alias */
40		if (m->oargs.nsargs != 1)
41		objerror(m, INTERNAL, "bad # string arguments");
42	<	aobj = lastmod(objndx(m), m->oargs.sarg[0]);
43	<	if (aobj < 0)
44	<	objerror(m, USER, "bad reference");
45	<	aop = objptr(aobj);
42	>	aop = m;
43	>	aobj = objndx(aop);
44	>	do {                            /* follow alias trail */
45	>	if (aop->oargs.nsargs == 1)
46	>	aobj = lastmod(aobj, aop->oargs.sarg[0]);
47	>	else
48	>	aobj = aop->omod;
49	>	if (aobj < 0)
50	>	objerror(aop, USER, "bad reference");
51	>	aop = objptr(aobj);
52	>	} while (aop->otype == MOD_ALIAS);
53	>	/* copy struct */
54		arec = *aop;
55		/* irradiance hack */
56		if (do_irrad && !(r->crtype & ~(PRIMARY|TRANS)) &&

Diff Legend

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