summaryrefslogtreecommitdiff
path: root/geometry.py
diff options
context:
space:
mode:
authorStan Seibert <stan@mtrr.org>2011-08-08 15:37:21 -0400
committerStan Seibert <stan@mtrr.org>2011-08-08 15:37:21 -0400
commitfd2cba0f96e2d145e6a2b6e3df91cb6e942c114c (patch)
treebcb6b902c10d8cafa00e228b634e5a0fbd6bf6ae /geometry.py
parent09e042b8888342ed8fc7a8c5b05ea1caa47a3842 (diff)
parented642493fccbcf13efef5491f73241c6a9434ad8 (diff)
downloadchroma-fd2cba0f96e2d145e6a2b6e3df91cb6e942c114c.tar.gz
chroma-fd2cba0f96e2d145e6a2b6e3df91cb6e942c114c.tar.bz2
chroma-fd2cba0f96e2d145e6a2b6e3df91cb6e942c114c.zip
Merge Tony's changes.
Diffstat (limited to 'geometry.py')
-rw-r--r--geometry.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/geometry.py b/geometry.py
index 1b85c51..37367e5 100644
--- a/geometry.py
+++ b/geometry.py
@@ -4,7 +4,7 @@ import pycuda.driver as cuda
from pycuda import gpuarray
from itertools import *
from itertoolset import *
-from camera import timeit
+from tools import timeit
# all material/surface properties are interpolated at these
# wavelengths when they are sent to the gpu