summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-01-28 17:28:19 +0000
committerjabiertxof <info@marker.es>2016-01-28 17:28:19 +0000
commit6320a06b45bf73834150d2d335815d9fe732b904 (patch)
tree3a010e73578f03d5cf7aefb327b37346fde9f733 /src/ui
parentAdd dinamic toolbar to spray,poligon/star and wrap tools (diff)
downloadinkscape-6320a06b45bf73834150d2d335815d9fe732b904.tar.gz
inkscape-6320a06b45bf73834150d2d335815d9fe732b904.zip
Fix a bug in eraser spray mode when no overlaps is disabled
(bzr r14622)
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/tools/spray-tool.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 71cad5c0d..9adaf3879 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -936,7 +936,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
Geom::Point center = item->getCenter();
Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
SPCSSAttr *css = sp_repr_css_attr_new();
- if(no_overlap || picker || !over_transparent || !over_no_transparent){
+ if(mode == SPRAY_MODE_ERASER || no_overlap || picker || !over_transparent || !over_no_transparent){
if(!fit_item(desktop
, item
, a
@@ -1072,7 +1072,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
Geom::Point center=item->getCenter();
Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
SPCSSAttr *css = sp_repr_css_attr_new();
- if(no_overlap || picker || !over_transparent || !over_no_transparent){
+ if(mode == SPRAY_MODE_ERASER || no_overlap || picker || !over_transparent || !over_no_transparent){
if(!fit_item(desktop
, item
, a