Mercurial > ldforge / changeset

--- a/src/glCompiler.cc	Wed Nov 05 03:49:29 2014 +0200
+++ b/src/glCompiler.cc	Wed Nov 05 17:48:11 2014 +0200
@@ -283,10 +283,14 @@
 		{
 			it = m_objectInfo.erase (it);
 		}
-		elif (it.key().toStrongRef()->document() == CurrentDocument()
-			and not it.key().toStrongRef()->isHidden())
+		else
 		{
-			vbodata += it->data[vbonum];
+			if (it.key().toStrongRef()->document() == CurrentDocument()
+				and not it.key().toStrongRef()->isHidden())
+			{
+				vbodata += it->data[vbonum];
+			}
+
 			++it;
 		}
 	}

--- a/src/ldDocument.cc	Wed Nov 05 03:49:29 2014 +0200
+++ b/src/ldDocument.cc	Wed Nov 05 17:48:11 2014 +0200
@@ -1408,8 +1408,6 @@
 		// just add it into the objects normally. Yay, recursion!
 		if (deep == true and obj->type() == OBJ_Subfile)
 		{
-			// If the subfile is BFC-inverted the rest of the files need to follow.
-			// This cannot be done in LDSubfile::inlineContents.
 			for (LDObjectPtr otherobj : obj.staticCast<LDSubfile>()->inlineContents (deep, renderinline))
 			{
 				if (invertnext)