diff options
| author | Ted Gould <ted@gould.cx> | 2010-03-26 04:34:25 +0000 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-03-26 04:34:25 +0000 |
| commit | 9e023a3aa964a0d3fa1e31e46d33657367ba68aa (patch) | |
| tree | 33f1392a340737e4eeefca6fd031f96c29befd2b /src/helper | |
| parent | Installing the pkgconfig file (diff) | |
| parent | Adding in shape-record.h (diff) | |
| download | inkscape-9e023a3aa964a0d3fa1e31e46d33657367ba68aa.tar.gz inkscape-9e023a3aa964a0d3fa1e31e46d33657367ba68aa.zip | |
Merge from trunk
(bzr r8254.1.53)
Diffstat (limited to 'src/helper')
| -rw-r--r-- | src/helper/pixbuf-ops.cpp | 2 | ||||
| -rw-r--r-- | src/helper/stock-items.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp index 1e43df5f3..3be63aa68 100644 --- a/src/helper/pixbuf-ops.cpp +++ b/src/helper/pixbuf-ops.cpp @@ -26,6 +26,7 @@ #include <document.h> #include <sp-item.h> #include <sp-root.h> +#include <sp-use.h> #include <sp-defs.h> #include "unit-constants.h" @@ -47,6 +48,7 @@ hide_other_items_recursively(SPObject *o, GSList *list, unsigned dkey) && !SP_IS_DEFS(o) && !SP_IS_ROOT(o) && !SP_IS_GROUP(o) + && !SP_IS_USE(o) && !g_slist_find(list, o) ) { sp_item_invoke_hide(SP_ITEM(o), dkey); diff --git a/src/helper/stock-items.cpp b/src/helper/stock-items.cpp index 575197fee..1c184da72 100644 --- a/src/helper/stock-items.cpp +++ b/src/helper/stock-items.cpp @@ -23,7 +23,7 @@ #include <xml/repr.h> -#include "sp-gradient-fns.h" +#include "sp-gradient.h" #include "document-private.h" #include "sp-pattern.h" #include "marker.h" |