Update to trunk

(bzr r11950.1.187)

2 files changed, 18 insertions, 18 deletions

diff --git a/src/sp-gradient.cpp b/src/sp-gradient.cpp
index adfff3609..04fb18cf3 100644
--- a/src/sp-gradient.cpp
+++ b/src/sp-gradient.cpp
@@ -418,23 +418,28 @@ void SPGradient::remove_child(Inkscape::XML::Node *child)
 void SPGradient::modified(guint flags)
 {
     if (flags & SP_OBJECT_CHILD_MODIFIED_FLAG) {
-    	// CPPIFY
+        // CPPIFY
+        // This comparison has never worked (i. e. always evaluated to false),
+        // the right value would have been SP_TYPE_MESHGRADIENT
         //if( this->get_type() != SP_GRADIENT_TYPE_MESH ) {
-    	if (!SP_IS_MESHGRADIENT(this)) {
-            this->invalidateVector();
-        } else {
-            this->invalidateArray();
-        }
+//        if (!SP_IS_MESHGRADIENT(this)) {
+//            this->invalidateVector();
+//        } else {
+//            this->invalidateArray();
+//        }
+        this->invalidateVector();
     }
 
     if (flags & SP_OBJECT_STYLE_MODIFIED_FLAG) {
-    	// CPPIFY
+        // CPPIFY
+        // see above
         //if( this->get_type() != SP_GRADIENT_TYPE_MESH ) {
-    	if (!SP_IS_MESHGRADIENT(this)) {
-            this->ensureVector();
-        } else {
-            this->ensureArray();
-        }
+//        if (!SP_IS_MESHGRADIENT(this)) {
+//            this->ensureVector();
+//        } else {
+//            this->ensureArray();
+//        }
+        this->ensureVector();
     }
 
     if (flags & SP_OBJECT_MODIFIED_FLAG) flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
diff --git a/src/sp-object.cpp b/src/sp-object.cpp
index 8c54caf48..2408370cf 100644
--- a/src/sp-object.cpp
+++ b/src/sp-object.cpp
@@ -648,11 +648,6 @@ void SPObject::build(SPDocument *document, Inkscape::XML::Node *repr) {
         try {
             const std::string typeString = NodeTraits::get_type_string(*rchild);
 
-            // special cases
-            if (typeString.empty()) continue;      // comments, usually
-            if (typeString == "rdf:RDF") continue; // no SP node yet
-            if (typeString == "inkscape:clipboard") continue; // SP node not necessary
-
             SPObject* child = SPFactory::instance().createObject(typeString);
 
             object->attach(child, object->lastChild());
@@ -663,7 +658,7 @@ void SPObject::build(SPDocument *document, Inkscape::XML::Node *repr) {
             // corresponding classes in the SPObject tree.
             // (rdf:RDF, inkscape:clipboard, ...)
             // Thus, simply ignore this case for now.
-            return;
+            continue;
         }
     }
 }