summaryrefslogtreecommitdiffstats
path: root/src/display/drawing-surface.cpp
diff options
context:
space:
mode:
authorGuiu Rocafort <neandertalspeople@gmail.com>2014-03-05 17:55:31 +0000
committerGuiu Rocafort <neandertalspeople@gmail.com>2014-03-05 17:55:31 +0000
commit2f732d93349881b4c8d4a0f9ee93ef5c9dd422dc (patch)
tree8998af65af0544ce2a92d71b82027607483a0ea3 /src/display/drawing-surface.cpp
parenttranslations from spanish to english done, it might need a little review, but... (diff)
parentChange tooltip to one more explicit to make cusp nodes (diff)
downloadinkscape-2f732d93349881b4c8d4a0f9ee93ef5c9dd422dc.tar.gz
inkscape-2f732d93349881b4c8d4a0f9ee93ef5c9dd422dc.zip
completed merging
(bzr r11950.5.2)
Diffstat (limited to 'src/display/drawing-surface.cpp')
-rw-r--r--src/display/drawing-surface.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/display/drawing-surface.cpp b/src/display/drawing-surface.cpp
index 94e0e1ab5..30579134b 100644
--- a/src/display/drawing-surface.cpp
+++ b/src/display/drawing-surface.cpp
@@ -123,7 +123,7 @@ DrawingSurface::scale() const
Geom::Affine
DrawingSurface::drawingTransform() const
{
- Geom::Affine ret = _scale * Geom::Translate(-_origin);
+ Geom::Affine ret = Geom::Translate(-_origin) * _scale;
return ret;
}