Merge branch 'master' into visitor

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

1 files changed, 1 insertions, 1 deletions

diff --git a/src/node.h b/src/node.h
index c95b45b..bd23ee8 100644
--- a/src/node.h
+++ b/src/node.h
@@ -83,7 +83,7 @@ public:
   /*! Should return a PolySet of the given geometry. It's normal to return an
 		  empty PolySet if smth. is wrong, but don't return NULL unless we change the calling
 			strategy for this method. */
-	virtual class PolySet *render_polyset(render_mode_e mode, class PolySetRenderer *renderer) const = 0;
+	virtual class PolySet *evaluate_polyset(render_mode_e mode, class PolySetEvaluator *evaluator) const = 0;
 };
 
 std::ostream &operator<<(std::ostream &stream, const AbstractNode &node);