diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-11-02 00:19:42 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-11-02 00:19:42 +0000 |
| commit | c3cf3749afd1dddde094e4e1cf5e6c3285c03261 (patch) | |
| tree | 9735a7e7876dadd3ac976bd2e7349536767d198e /src/live_effects/lpe-bspline.cpp | |
| parent | Fix a bug in perspective/envelope LPE, rendering points -handles- outside bou... (diff) | |
| download | inkscape-c3cf3749afd1dddde094e4e1cf5e6c3285c03261.tar.gz inkscape-c3cf3749afd1dddde094e4e1cf5e6c3285c03261.zip | |
Change calls to desktop with SP_ACTIVE_DESKTOP
(bzr r13656)
Diffstat (limited to 'src/live_effects/lpe-bspline.cpp')
| -rw-r--r-- | src/live_effects/lpe-bspline.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/live_effects/lpe-bspline.cpp b/src/live_effects/lpe-bspline.cpp index e1ff49959..4f5ec2609 100644 --- a/src/live_effects/lpe-bspline.cpp +++ b/src/live_effects/lpe-bspline.cpp @@ -129,9 +129,8 @@ void LPEBSpline::doEffect(SPCurve *curve) double radiusHelperNodes = 6.0; SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (desktop){ - radiusHelperNodes /= SP_ACTIVE_DESKTOP->current_zoom(); - SPNamedView *nv = sp_desktop_namedview(desktop); - radiusHelperNodes = Inkscape::Util::Quantity::convert(radiusHelperNodes, "px", nv->doc_units->abbr); + radiusHelperNodes /= desktop->current_zoom(); + radiusHelperNodes = Inkscape::Util::Quantity::convert(radiusHelperNodes, "px", desktop->namedview->doc_units->abbr); } for (Geom::PathVector::const_iterator path_it = original_pathv.begin(); path_it != original_pathv.end(); ++path_it) { @@ -408,7 +407,7 @@ void LPEBSpline::toWeight() void LPEBSpline::changeWeight(double weightValue) { - SPDesktop *desktop = inkscape_active_desktop(); + SPDesktop *desktop = SP_ACTIVE_DESKTOP; Inkscape::Selection *selection = sp_desktop_selection(desktop); GSList *items = (GSList *)selection->itemList(); SPItem *item = (SPItem *)g_slist_nth(items, 0)->data; @@ -450,7 +449,7 @@ void LPEBSpline::doBSplineFromWidget(SPCurve *curve, double weightValue) { using Geom::X; using Geom::Y; - SPDesktop *desktop = inkscape_active_desktop(); + SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (INK_IS_NODE_TOOL(desktop->event_context)) { Inkscape::UI::Tools::NodeTool *nt = INK_NODE_TOOL(desktop->event_context); Inkscape::UI::ControlPointSelection::Set &selection = |