summaryrefslogtreecommitdiffstats
path: root/src/seltrans.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2011-07-06 01:59:32 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2011-07-06 01:59:32 +0000
commite65a02ed32b78534739aba24929ece7c44dd967f (patch)
tree13cf022f18f6b5bae46aad4bc339e512f069a514 /src/seltrans.cpp
parentPull 2Geom revision 2013 (extra constructors for Rect). (diff)
parentText edit dialog: Apply button should grab default only after adding to window (diff)
downloadinkscape-e65a02ed32b78534739aba24929ece7c44dd967f.tar.gz
inkscape-e65a02ed32b78534739aba24929ece7c44dd967f.zip
Merge from trunk
(bzr r10347.1.5)
Diffstat (limited to 'src/seltrans.cpp')
-rw-r--r--src/seltrans.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/seltrans.cpp b/src/seltrans.cpp
index bb333caca..f95a204a9 100644
--- a/src/seltrans.cpp
+++ b/src/seltrans.cpp
@@ -359,7 +359,7 @@ void Inkscape::SelTrans::grab(Geom::Point const &p, gdouble x, gdouble y, bool s
// points immediately.
if (prefs->getBool("/options/snapclosestonly/value", false)) {
- if (m.snapprefs.getSnapModeNode()) {
+ if (m.snapprefs.getSnapModeNode() || m.snapprefs.getSnapModeOthers()) {
m.keepClosestPointOnly(_snap_points, p);
} else {
_snap_points.clear(); // don't keep any point