Merge branch 'master' into visitor

Conflicts:
	src/GLView.h
	src/glview.cc
	src/mainwin.cc
	src/render-opencsg.cc

1 files changed, 15 insertions, 0 deletions

diff --git a/src/PolySetEvaluator.cc b/src/PolySetEvaluator.cc
new file mode 100644
index 0000000..56acb1d
--- /dev/null
+++ b/src/PolySetEvaluator.cc
@@ -0,0 +1,15 @@
+#include "PolySetEvaluator.h"
+#include "printutils.h"
+#include "polyset.h"
+
+PolySetEvaluator *PolySetEvaluator::global_evaluator = NULL;
+
+PolySetEvaluator::cache_entry::cache_entry(PolySet *ps) :
+		ps(ps), msg(print_messages_stack.last())
+{
+}
+
+PolySetEvaluator::cache_entry::~cache_entry()
+{
+	ps->unlink();
+}