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, 2 insertions, 1 deletions

diff --git a/src/Tree.h b/src/Tree.h
index 2c3f0b8..aaa61d7 100644
--- a/src/Tree.h
+++ b/src/Tree.h
@@ -20,12 +20,13 @@ public:
 	void setRoot(const AbstractNode *root);
 	const AbstractNode *root() const { return this->root_node; }
 
-  // FIXME: Really return a reference?
 	const string &getString(const AbstractNode &node) const;
+	const string &getIdString(const AbstractNode &node) const;
 
 private:
 	const AbstractNode *root_node;
   mutable NodeCache nodecache;
+  mutable NodeCache nodeidcache;
 };
 
 #endif