From 9e8817bdc8c0a28e617c0fefefab7f3d6f682779 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 10 Feb 2017 17:48:33 +0000
Subject: [PATCH] fix
---
Geo/GModelIO_OCC.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Geo/GModelIO_OCC.cpp b/Geo/GModelIO_OCC.cpp
index 834758d7c3..822312a509 100644
--- a/Geo/GModelIO_OCC.cpp
+++ b/Geo/GModelIO_OCC.cpp
@@ -1056,7 +1056,7 @@ void OCC_Internals::applyBooleanOperator(int tag, BooleanOperator op,
TopoDS_Shape result;
-#if 1//OCC_VERSION_HEX >= 0x060900
+#if OCC_VERSION_HEX >= 0x060900
TopTools_ListOfShape objectShapes, toolShapes;
for(int dim = 0; dim < 4; dim++){
for(unsigned int i = 0; i < objects[dim].size(); i++){
@@ -1078,7 +1078,7 @@ void OCC_Internals::applyBooleanOperator(int tag, BooleanOperator op,
switch(op){
case OCC_Internals::Union :
{
-#if 1//OCC_VERSION_HEX < 0x060900
+#if OCC_VERSION_HEX < 0x060900
for(int dim = 0; dim < 4; dim++){
if(objects[dim].empty() || tools[dim].empty()) continue;
result = objects[dim][0];
@@ -1123,7 +1123,7 @@ void OCC_Internals::applyBooleanOperator(int tag, BooleanOperator op,
break;
case OCC_Internals::Intersection :
{
-#if 1//OCC_VERSION_HEX < 0x060900
+#if OCC_VERSION_HEX < 0x060900
for(int dim = 0; dim < 4; dim++){
if(objects[dim].empty() || tools[dim].empty()) continue;
if(objects[dim].size() != 1 || tools[dim].size() != 1){
@@ -1159,7 +1159,7 @@ void OCC_Internals::applyBooleanOperator(int tag, BooleanOperator op,
case OCC_Internals::Difference :
default:
{
-#if 1//OCC_VERSION_HEX < 0x060900
+#if OCC_VERSION_HEX < 0x060900
for(int dim = 0; dim < 4; dim++){
if(objects[dim].empty() || tools[dim].empty()) continue;
if(objects[dim].size() != 1 || tools[dim].size() != 1){
@@ -1194,7 +1194,7 @@ void OCC_Internals::applyBooleanOperator(int tag, BooleanOperator op,
case OCC_Internals::Fragments :
{
-#if 1//OCC_VERSION_HEX < 0x060900
+#if OCC_VERSION_HEX < 0x060900
Msg::Error("Boolean fragments only available with OpenCASCADE >= 6.9");
return;
#else
--
GitLab