diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-05-21 22:13:06 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-05-21 22:13:06 +0000 |
| commit | eef0bdfef0bdbaa00c17067c601061d905974096 (patch) | |
| tree | 737c7efb116ec01e23e8d21ae9f9acc92923c708 /src/ui/tools | |
| parent | Fixing undo thing (diff) | |
| parent | Remove duplicated code (diff) | |
| download | inkscape-eef0bdfef0bdbaa00c17067c601061d905974096.tar.gz inkscape-eef0bdfef0bdbaa00c17067c601061d905974096.zip | |
update to trunk
(bzr r14865.1.6)
Diffstat (limited to 'src/ui/tools')
| -rw-r--r-- | src/ui/tools/freehand-base.cpp | 5 | ||||
| -rw-r--r-- | src/ui/tools/node-tool.cpp | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp index 613857626..c98ecb686 100644 --- a/src/ui/tools/freehand-base.cpp +++ b/src/ui/tools/freehand-base.cpp @@ -43,6 +43,7 @@ #include "snap.h" #include "sp-path.h" #include "sp-use.h" +#include "sp-item-group.h" #include "sp-namedview.h" #include "live_effects/lpe-powerstroke.h" #include "style.h" @@ -432,7 +433,7 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item, if(cm->paste(SP_ACTIVE_DESKTOP,true) == true){ gchar const *svgd = item->getRepr()->attribute("d"); bend_item = dc->selection->singleItem(); - if(bend_item){ + if(bend_item && (SP_IS_SHAPE(bend_item) || SP_IS_GROUP(bend_item))){ bend_item->moveTo(item,false); bend_item->transform.setTranslation(Geom::Point()); spdc_apply_bend_shape(svgd, dc, bend_item); @@ -440,9 +441,11 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item, shape = BEND_CLIPBOARD; } else { + bend_item = NULL; shape = NONE; } } else { + bend_item = NULL; shape = NONE; } break; diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp index 4149403ea..23aaf6bb1 100644 --- a/src/ui/tools/node-tool.cpp +++ b/src/ui/tools/node-tool.cpp @@ -164,11 +164,6 @@ NodeTool::~NodeTool() { if (this->helperpath_tmpitem) { this->desktop->remove_temporary_canvasitem(this->helperpath_tmpitem); } - - if (this->helperpath_tmpitem) { - this->desktop->remove_temporary_canvasitem(this->helperpath_tmpitem); - } - this->_selection_changed_connection.disconnect(); //this->_selection_modified_connection.disconnect(); this->_mouseover_changed_connection.disconnect(); |