diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-08-04 13:19:52 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-08-04 13:19:52 +0000 |
| commit | c87f9bac5947a51cac43d3487c76aac005d81af8 (patch) | |
| tree | e4ee49c51388a490fa9cf789df32f2a97ef49e58 /src/object-snapper.cpp | |
| parent | Cleaned up once more. (diff) | |
| parent | catch exception by reference (diff) | |
| download | inkscape-c87f9bac5947a51cac43d3487c76aac005d81af8.tar.gz inkscape-c87f9bac5947a51cac43d3487c76aac005d81af8.zip | |
Merged from trunk (r12465).
(bzr r11608.1.119)
Diffstat (limited to 'src/object-snapper.cpp')
| -rw-r--r-- | src/object-snapper.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp index e6f6d87db..77ba3040f 100644 --- a/src/object-snapper.cpp +++ b/src/object-snapper.cpp @@ -106,12 +106,11 @@ void Inkscape::ObjectSnapper::_findCandidates(SPObject* parent, if (it == NULL || i == it->end()) { SPItem *item = SP_ITEM(o); if (item) { - SPObject *obj = NULL; if (!clip_or_mask) { // cannot clip or mask more than once // The current item is not a clipping path or a mask, but might // still be the subject of clipping or masking itself ; if so, then // we should also consider that path or mask for snapping to - obj = SP_OBJECT(item->clip_ref ? item->clip_ref->getObject() : NULL); + SPObject *obj = SP_OBJECT(item->clip_ref ? item->clip_ref->getObject() : NULL); if (obj && _snapmanager->snapprefs.isTargetSnappable(SNAPTARGET_PATH_CLIP)) { _findCandidates(obj, it, false, bbox_to_snap, true, item->i2doc_affine()); } |