summaryrefslogtreecommitdiffstats
path: root/src/snap.cpp
diff options
context:
space:
mode:
authorDiederik van Lierop <mail@diedenrezi.nl>2008-08-30 19:27:32 +0000
committerdvlierop2 <dvlierop2@users.sourceforge.net>2008-08-30 19:27:32 +0000
commitd36da3ec31ec1db718b4b990ae5acdb3d9a919e5 (patch)
tree09c70fd312ab02855f4bff28701a39e3d04fc2a4 /src/snap.cpp
parent* Some minor markup errors fixed (diff)
downloadinkscape-d36da3ec31ec1db718b4b990ae5acdb3d9a919e5.tar.gz
inkscape-d36da3ec31ec1db718b4b990ae5acdb3d9a919e5.zip
Eliminate SP_ACTIVE_DESKTOP in the object-snapper
(bzr r6730)
Diffstat (limited to 'src/snap.cpp')
-rw-r--r--src/snap.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/snap.cpp b/src/snap.cpp
index 15bc8658d..54eb500e1 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -886,7 +886,8 @@ Inkscape::SnappedPoint SnapManager::findBestSnap(Geom::Point const &p, SnappedCo
void SnapManager::setup(SPDesktop const *desktop, bool snapindicator, SPItem const *item_to_ignore, std::vector<Geom::Point> *unselected_nodes)
{
g_assert(desktop != NULL);
- _item_to_ignore = item_to_ignore;
+ object.setDesktop(desktop);
+ _item_to_ignore = item_to_ignore;
_items_to_ignore = NULL;
_desktop = desktop;
_snapindicator = snapindicator;
@@ -896,6 +897,7 @@ void SnapManager::setup(SPDesktop const *desktop, bool snapindicator, SPItem con
void SnapManager::setup(SPDesktop const *desktop, bool snapindicator, std::vector<SPItem const *> &items_to_ignore, std::vector<Geom::Point> *unselected_nodes)
{
g_assert(desktop != NULL);
+ object.setDesktop(desktop);
_item_to_ignore = NULL;
_items_to_ignore = &items_to_ignore;
_desktop = desktop;