ViewVC Help

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

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

Comparing ray/src/common/instance.c (file contents):
Revision 2.9 by greg, Thu Jul 10 03:30:11 2003 UTC vs.
Revision 2.12 by greg, Tue Mar 22 03:56:17 2016 UTC

#	Line 7 | Line 7 | static const char RCSid[] = "$Id$";
7
8		#include "copyright.h"
9
10	<	#include  "standard.h"
10	>	#include  "rtmath.h"
11	>	#include  "rterror.h"
12	>	#include  "rtio.h"
13	>	#include  "paths.h"
14
15		#include  "octree.h"
13	–
16		#include  "object.h"
15	–
17		#include  "instance.h"
18
19		#define  IO_ILLEGAL     (IO_FILES|IO_INFO)
#	Line 49 | Line 50 | int  flags;
50		}
51		if ((pathname = getpath(sname, getrlibpath(), R_OK)) == NULL) {
52		sprintf(errmsg, "cannot find octree file \"%s\"", sname);
53	<	error(USER, errmsg);
53	>	error(SYSTEM, errmsg);
54		}
55		flags &= ~sc->ldflags;          /* skip what's already loaded */
56		if (flags & IO_SCENE)

Diff Legend

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