diff options
| author | Martin Owens <doctormo@gmail.com> | 2013-06-14 02:36:04 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2013-06-14 02:36:04 +0000 |
| commit | 4905eea9e87b0ee6709dd838f1378409ea1250a3 (patch) | |
| tree | b5f408b614e0cca2086897ac2f995515c303f3d5 /src/sp-shape.cpp | |
| parent | Use fixed inkscape icon for 'no-marker' instead of gtk theme icon (diff) | |
| download | inkscape-4905eea9e87b0ee6709dd838f1378409ea1250a3.tar.gz inkscape-4905eea9e87b0ee6709dd838f1378409ea1250a3.zip | |
Do not allow markers for children of markers (prevent loop)
Fixed bugs:
- https://launchpad.net/bugs/261786
(bzr r12372)
Diffstat (limited to 'src/sp-shape.cpp')
| -rw-r--r-- | src/sp-shape.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/sp-shape.cpp b/src/sp-shape.cpp index be9f5388c..38ffbb20c 100644 --- a/src/sp-shape.cpp +++ b/src/sp-shape.cpp @@ -868,6 +868,13 @@ int SPShape::hasMarkers() const all three settings. This should be fixed later such that if 'marker' is specified, then all three should appear. */ + // Ignore markers for objects which are inside markers themselves. + for (SPObject *parent = this->parent; parent != NULL; parent = parent->parent) { + if(SP_IS_MARKER(parent)) { + return 0; + } + } + return ( this->_curve && (this->_marker[SP_MARKER_LOC] || |