Travis: Add SMESH7 dependencies for OSX

FreeCAD · Jun 15, 2016 · 59803ff · 59803ff
1 parent 1ab9209
commit 59803ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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!");