merge error

2014-01-15 23:53:35 -05:00 · 2014-01-15 23:53:35 -05:00 · c8291b0645
parent 696f2d5182
commit c8291b0645
1 changed files with 1 additions and 1 deletions
--- a/src/cgalutils.cc
+++ b/src/cgalutils.cc
@ -79,7 +79,7 @@ namespace CGALUtils {
 		}
 		if (src.isEmpty()) {
 			// Intersecting something with nothing results in nothing
-			if (op == CGE_INTERSECTION) target = src;
+			if (op == OPENSCAD_INTERSECTION) target = src;
 			// else keep target unmodified
 			return;
 		}