Eliminate SP_ACTIVE_DESKTOP in the object-snapper

[inkscape.git] / src / snap.cpp

diff --git a/src/snap.cpp b/src/snap.cpp
index 15bc8658d4c56aa9dd0dfbc316a925004616d23a..54eb500e15437f310d846c26ca618972ec5190cf 100644 (file)
--- 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;