Mercurial > ldforge / file diff

--- a/src/lddocument.cpp	Mon Mar 19 11:04:18 2018 +0200
+++ b/src/lddocument.cpp	Mon Mar 19 12:24:59 2018 +0200
@@ -529,7 +529,13 @@
 					if (deep and object->type() == LDObjectType::SubfileReference)
 					{
 						LDSubfileReference* reference = static_cast<LDSubfileReference*>(object);
-						reference->inlineContents(documentManager(), model, deep, renderinline);
+						reference->inlineContents(
+							documentManager(),
+							this->header.winding,
+							model,
+							deep,
+							renderinline
+						);
 					}
 					else
 					{
@@ -568,15 +574,3 @@
 {
 	m_verticesOutdated = true;
 }
-
-/*
- * Special operator definition that implements the XOR operator for windings.
- * However, if either winding is NoWinding, then this function returns NoWinding.
- */
-Winding operator^(Winding one, Winding other)
-{
-	if (one == NoWinding or other == NoWinding)
-		return NoWinding;
-	else
-		return static_cast<Winding>(static_cast<int>(one) ^ static_cast<int>(other));
-}