merge

Merge remote branch 'upstream/visitor' into visitortests

Conflicts:
	src/export.cc
	src/openscad.cc
	src/polyset.cc
	src/transform.cc
	tests/CMakeLists.txt
	tests/FindGLEW.cmake
	tests/csgtermtest.cc

1 files changed, 20 insertions, 0 deletions

diff --git a/src/colornode.h b/src/colornode.h
new file mode 100644
index 0000000..b41e2a9
--- /dev/null
+++ b/src/colornode.h
@@ -0,0 +1,20 @@
+#ifndef COLORNODE_H_
+#define COLORNODE_H_
+
+#include "node.h"
+#include "visitor.h"
+
+class ColorNode : public AbstractNode
+{
+public:
+	ColorNode(const ModuleInstantiation *mi) : AbstractNode(mi) { }
+  virtual Response accept(class State &state, Visitor &visitor) const {
+		return visitor.visit(state, *this);
+	}
+	virtual std::string toString() const;
+	virtual std::string name() const;
+
+	double color[4];
+};
+
+#endif