Mercurial > ldforge2 / file diff

--- a/src/linetypes/conditionaledge.h	Tue Jan 28 23:34:49 2020 +0200
+++ b/src/linetypes/conditionaledge.h	Thu Jan 30 19:20:11 2020 +0200
@@ -1,12 +1,12 @@
 #pragma once
 #include "edge.h"
 
-namespace linetypes
+namespace ldraw
 {
 	class ConditionalEdge;
 }
 
-class linetypes::ConditionalEdge : public Edge
+class ldraw::ConditionalEdge : public Edge
 {
 public:
 	ConditionalEdge() = default;
@@ -15,7 +15,7 @@
 		const glm::vec3& point_2,
 		const glm::vec3& controlPoint_1,
 		const glm::vec3& controlPoint_2,
-		const Color colorIndex = colors::edge);
+		const Color colorIndex = ldraw::edgeColor);
 	ConditionalEdge(const QVector<glm::vec3>& vertices, const Color color);
 	QVariant getProperty(Property property) const override;
 	SetPropertyResult setProperty(