diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index 3845be23219b8ceb8e51a69cafa1f403e42dd6ff..5884277521c9a24fcfac82d519363029c005d18d 100644 (file)
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
static gchar * sp_group_description (SPItem * item);
static NRArenaItem *sp_group_show (SPItem *item, NRArena *arena, unsigned int key, unsigned int flags);
static void sp_group_hide (SPItem * item, unsigned int key);
-static void sp_group_snappoints (SPItem const *item, bool const target, SnapPointsWithType &p, Inkscape::SnapPreferences const *snapprefs);
+static void sp_group_snappoints (SPItem const *item, std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs);
static void sp_group_update_patheffect(SPLPEItem *lpeitem, bool write);
static void sp_group_perform_patheffect(SPGroup *group, SPGroup *topgroup, bool write);
@@ -258,6 +258,8 @@ sp_group_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XM
const char *value;
if ( group->_layer_mode == SPGroup::LAYER ) {
value = "layer";
+ } else if ( group->_layer_mode == SPGroup::MASK_HELPER ) {
+ value = "maskhelper";
} else if ( flags & SP_OBJECT_WRITE_ALL ) {
value = "group";
} else {
case SP_ATTR_INKSCAPE_GROUPMODE:
if ( value && !strcmp(value, "layer") ) {
group->setLayerMode(SPGroup::LAYER);
+ } else if ( value && !strcmp(value, "maskhelper") ) {
+ group->setLayerMode(SPGroup::MASK_HELPER);
} else {
group->setLayerMode(SPGroup::GROUP);
}
SP_GROUP(item)->group->hide(key);
}
-static void sp_group_snappoints (SPItem const *item, bool const target, SnapPointsWithType &p, Inkscape::SnapPreferences const *snapprefs)
+static void sp_group_snappoints (SPItem const *item, std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs)
{
for (SPObject const *o = sp_object_first_child(SP_OBJECT(item));
o != NULL;
o = SP_OBJECT_NEXT(o))
{
if (SP_IS_ITEM(o)) {
- sp_item_snappoints(SP_ITEM(o), target, p, snapprefs);
+ sp_item_snappoints(SP_ITEM(o), p, snapprefs);
}
}
}
if ( _layer_mode != mode ) {
if ( mode == LAYER ) {
sp_document_add_resource(SP_OBJECT_DOCUMENT(this), "layer", this);
- } else {
+ } else if ( _layer_mode == LAYER ) {
sp_document_remove_resource(SP_OBJECT_DOCUMENT(this), "layer", this);
}
_layer_mode = mode;