From 59803ffc67d77793c656413947ebb9b8a06d2e0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Tr=C3=B6ger?= Date: Mon, 16 May 2016 16:47:39 +0200 Subject: [PATCH] Travis: Add SMESH7 dependencies for OSX --- .travis.yml | 3 +++ src/Mod/PartDesign/App/FeatureGroove.cpp | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 10eb67ee552c..94dce06df123 100755 --- a/.travis.yml +++ b/.travis.yml @@ -127,11 +127,14 @@ before_install: pyside-tools \ xerces-c \ orocos-kdl \ + hdf5 \ homebrew/science/oce \ homebrew/python/matplotlib + brew install vtk --without-python brew install --with-oce homebrew/science/nglib brew install --without-framework --without-soqt sanelson/freecad/coin brew install --HEAD pivy + brew install bblacey/taps/med-file --with-python #Install the 3DConnexion frameworks if [ ! -d /Library/Frameworks/3DconnexionClient.framework ]; then diff --git a/src/Mod/PartDesign/App/FeatureGroove.cpp b/src/Mod/PartDesign/App/FeatureGroove.cpp index a5d925efbd73..058df6db1e6b 100644 --- a/src/Mod/PartDesign/App/FeatureGroove.cpp +++ b/src/Mod/PartDesign/App/FeatureGroove.cpp @@ -132,7 +132,6 @@ App::DocumentObjectExecReturn *Groove::execute(void) TopExp_Explorer xp; xp.Init(sketchshape, TopAbs_FACE); for (;xp.More(); xp.Next()) { - if (checkLineCrossesFace(gp_Lin(pnt, dir), TopoDS::Face(xp.Current()))) return new App::DocumentObjectExecReturn("Revolve axis intersects the sketch"); } @@ -158,7 +157,7 @@ App::DocumentObjectExecReturn *Groove::execute(void) return new App::DocumentObjectExecReturn("Resulting shape is not a solid"); solRes = refineShapeIfActive(solRes); - this->Shape.setValue(solRes); + this->Shape.setValue(getSolid(solRes)); } else return new App::DocumentObjectExecReturn("Could not revolve the sketch!");