Mercurial > ldforge / file diff

--- a/src/glRenderer.cc	Mon Jun 02 13:00:58 2014 +0300
+++ b/src/glRenderer.cc	Mon Jun 02 13:16:14 2014 +0300
@@ -1660,7 +1660,7 @@
 		for (int i = 0; i < obj->numVertices(); ++i)
 			verts << obj->vertex (i);
 	}
-	elif (obj->type() == LDObject::ESubfile)
+	elif (obj->type() == OBJ_Subfile)
 	{
 		LDSubfilePtr ref = obj.staticCast<LDSubfile>();
 		LDObjectList objs = ref->inlineContents (true, false);
@@ -2072,7 +2072,7 @@
 			// If this is the last overlay image, we need to remove the empty space after it as well.
 			LDObjectPtr nextobj = ovlobj->next();
 
-			if (nextobj && nextobj->type() == LDObject::EEmpty)
+			if (nextobj && nextobj->type() == OBJ_Empty)
 				nextobj->destroy();
 
 			// If the overlay object was there and the overlay itself is
@@ -2104,7 +2104,7 @@
 					break;
 				}
 
-				if (obj->type() == LDObject::EOverlay)
+				if (obj->type() == OBJ_Overlay)
 					lastOverlay = i;
 			}