From 8d95b48ad2c2276c3cad7e17300c7152f598d636 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Mon, 13 Jan 2014 23:04:22 -0500
Subject: Revert "Fixed an issue which caused us to traverse the entire tree
 for OpenCSG rendering traversals, where we didn't actually use the traversal
 results (for all nodes requiring CGAL)"

This reverts commit 448f8b4142acb00efb7e57e575fe6d5aaabec47c.

-> We need to traverse the subtrees to be able to pick up debug and highlight modifiers

diff --git a/src/CSGTermEvaluator.cc b/src/CSGTermEvaluator.cc
index 647a3dc..56f7b3a 100644
--- a/src/CSGTermEvaluator.cc
+++ b/src/CSGTermEvaluator.cc
@@ -108,7 +108,7 @@ static shared_ptr<CSGTerm> evaluate_csg_term_from_ps(const State &state,
 
 Response CSGTermEvaluator::visit(State &state, const AbstractPolyNode &node)
 {
-	if (state.isPrefix()) {
+	if (state.isPostfix()) {
 		shared_ptr<CSGTerm> t1;
 		if (this->psevaluator) {
 			shared_ptr<PolySet> ps = this->psevaluator->getPolySet(node, true);
@@ -121,7 +121,7 @@ Response CSGTermEvaluator::visit(State &state, const AbstractPolyNode &node)
 		this->stored_term[node.index()] = t1;
 		addToParent(state, node);
 	}
-	return PruneTraversal;
+	return ContinueTraversal;
 }
 
 Response CSGTermEvaluator::visit(State &state, const CsgNode &node)
@@ -174,7 +174,7 @@ Response CSGTermEvaluator::visit(State &state, const ColorNode &node)
 // FIXME: If we've got CGAL support, render this node as a CGAL union into a PolySet
 Response CSGTermEvaluator::visit(State &state, const RenderNode &node)
 {
-	if (state.isPrefix()) {
+	if (state.isPostfix()) {
 		shared_ptr<CSGTerm> t1;
 		shared_ptr<PolySet> ps;
 		if (this->psevaluator) {
@@ -188,12 +188,12 @@ Response CSGTermEvaluator::visit(State &state, const RenderNode &node)
 		this->stored_term[node.index()] = t1;
 		addToParent(state, node);
 	}
-	return PruneTraversal;
+	return ContinueTraversal;
 }
 
 Response CSGTermEvaluator::visit(State &state, const CgaladvNode &node)
 {
-	if (state.isPrefix()) {
+	if (state.isPostfix()) {
 		shared_ptr<CSGTerm> t1;
     // FIXME: Calling evaluator directly since we're not a PolyNode. Generalize this.
 		shared_ptr<PolySet> ps;
@@ -208,7 +208,7 @@ Response CSGTermEvaluator::visit(State &state, const CgaladvNode &node)
 		this->stored_term[node.index()] = t1;
 		addToParent(state, node);
 	}
-	return PruneTraversal;
+	return ContinueTraversal;
 }
 
 /*!
-- 
cgit v0.10.1