diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-12-01 16:47:43 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-12-01 16:47:43 +0000 |
| commit | 16b6bdbb7c160d95473256c7b414125310af25fe (patch) | |
| tree | 0cb2b056c6f7ff7bf1ce50aac8cea8f064af1a0f /src/display/drawing-item.cpp | |
| parent | Fix merging (diff) | |
| download | inkscape-16b6bdbb7c160d95473256c7b414125310af25fe.tar.gz inkscape-16b6bdbb7c160d95473256c7b414125310af25fe.zip | |
Fix merging
Diffstat (limited to 'src/display/drawing-item.cpp')
| -rw-r--r-- | src/display/drawing-item.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/display/drawing-item.cpp b/src/display/drawing-item.cpp index 922576ec5..d3729da94 100644 --- a/src/display/drawing-item.cpp +++ b/src/display/drawing-item.cpp @@ -121,7 +121,7 @@ DrawingItem::DrawingItem(Drawing &drawing) , _fill_pattern(nullptr) , _stroke_pattern(nullptr) , _filter(nullptr) - , _user_data(nullptr) + , _item(nullptr) , _cache(nullptr) , _state(0) , _child_type(CHILD_ORPHAN) @@ -1031,10 +1031,9 @@ DrawingItem::pick(Geom::Point const &p, double delta, unsigned flags) Glib::ustring DrawingItem::name() { - SPObject *object = static_cast<SPObject *>(_user_data); - if (object) { - if(object->getId()) - return object->getId(); + if (_item) { + if (_item->getId()) + return _item->getId(); else return "No object id"; } else { |