summaryrefslogtreecommitdiffstats
path: root/src/display/nr-3dutils.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2011-04-07 23:42:04 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2011-04-07 23:42:04 +0000
commit945ce419c806c73d70203dec33ececafbe108a92 (patch)
treecfcdb59bf47e9db7f9e01f7eebb59924bdeaea94 /src/display/nr-3dutils.cpp
parentMerge from trunk (again) (diff)
parentExtensions. SVG+media fix (see Bug #400356). (diff)
downloadinkscape-945ce419c806c73d70203dec33ececafbe108a92.tar.gz
inkscape-945ce419c806c73d70203dec33ececafbe108a92.zip
Merge from trunk
(bzr r9508.1.73)
Diffstat (limited to 'src/display/nr-3dutils.cpp')
-rw-r--r--src/display/nr-3dutils.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/display/nr-3dutils.cpp b/src/display/nr-3dutils.cpp
index 4518269af..eb6858374 100644
--- a/src/display/nr-3dutils.cpp
+++ b/src/display/nr-3dutils.cpp
@@ -14,11 +14,11 @@
#include "display/nr-3dutils.h"
#include <cmath>
#include <2geom/point.h>
-#include <2geom/matrix.h>
+#include <2geom/affine.h>
namespace NR {
-void convert_coord(gdouble &x, gdouble &y, gdouble &z, Geom::Matrix const &trans) {
+void convert_coord(gdouble &x, gdouble &y, gdouble &z, Geom::Affine const &trans) {
Geom::Point p = Geom::Point(x, y);
p *= trans;
x = p[Geom::X];