diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2013-10-04 20:53:18 +0000 |
|---|---|---|
| committer | Johan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl> | 2013-10-04 20:53:18 +0000 |
| commit | b40810c40eb3631a47ca16968d96294f795baee8 (patch) | |
| tree | 4d0038e15bff2d3f05dc67ed45d398099734ea9d /src | |
| parent | fix hiding overloaded virtual (diff) | |
| download | inkscape-b40810c40eb3631a47ca16968d96294f795baee8.tar.gz inkscape-b40810c40eb3631a47ca16968d96294f795baee8.zip | |
fix bug (added some comments to jabiertxof's patch)
Fixed bugs:
- https://launchpad.net/bugs/1235032
(bzr r12658)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/tool/path-manipulator.cpp | 5 | ||||
| -rw-r--r-- | src/ui/tool/path-manipulator.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp index 3d080ad19..36f78af9d 100644 --- a/src/ui/tool/path-manipulator.cpp +++ b/src/ui/tool/path-manipulator.cpp @@ -203,7 +203,7 @@ void PathManipulator::writeXML() sp_object_ref(_path); _path->deleteObject(true, true); sp_object_unref(_path); - _path = 0; + _path = NULL; } _observer->unblock(); } @@ -1206,7 +1206,8 @@ void PathManipulator::_createGeometryFromControlPoints(bool alert_LPE) Geom::PathVector pathv = builder.peek() * (_edit_transform * _i2d_transform).inverse(); _spcurve->set_pathvector(pathv); if (alert_LPE) { - if (_path->hasPathEffect()) { + /// \todo note that _path can be an Inkscape::LivePathEffect::Effect* too, kind of confusing, rework member naming? + if (SP_IS_LPE_ITEM(_path) && _path->hasPathEffect()) { PathEffectList effect_list = sp_lpe_item_get_effect_list(_path); LivePathEffect::LPEPowerStroke *lpe_pwr = dynamic_cast<LivePathEffect::LPEPowerStroke*>( effect_list.front()->lpeobject->get_lpe() ); if (lpe_pwr) { diff --git a/src/ui/tool/path-manipulator.h b/src/ui/tool/path-manipulator.h index 1444272e8..e01e8617f 100644 --- a/src/ui/tool/path-manipulator.h +++ b/src/ui/tool/path-manipulator.h @@ -131,7 +131,7 @@ private: SubpathList _subpaths; MultiPathManipulator &_multi_path_manipulator; - SPPath *_path; + SPPath *_path; ///< can be an SPPath or an Inkscape::LivePathEffect::Effect !!! SPCurve *_spcurve; // in item coordinates SPCanvasItem *_outline; CurveDragPoint *_dragpoint; // an invisible control point hoverng over curve |