suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FEM Post: fix vtk include wthout guard

Browse Source
This commit is contained in:
Stefan Tröger 2016-04-13 21:44:07 +02:00 committed by wmayer
parent 95d1e8244f
commit 4c9d4e1fdc
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Fem/App/AppFemPy.cpp
View File

@ -64,8 +64,10 @@
#include "FemMesh.h"
#include "FemMeshObject.h"
#include "FemPostPipeline.h"
#include "FemMeshPy.h"
#ifdef FC_USE_VTK
#include "FemPostPipeline.h"
#endif
#include <cstdlib>

9
src/Mod/Fem/App/AppFemPy.cpp.orig
View File

@ -1,4 +1,4 @@
<<<<<<< eec6f7aee8b6e5979a799358e2ae69bdc5a7af5b
<<<<<<< 9049674212e3b4f1429e82bfa203304100632838
/***************************************************************************
* Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) *
* *
@ -188,6 +188,7 @@ private:
pcFeature->Label.setValue(file.fileNamePure().c_str());
pcFeature->read(file);
pcFeature->touch();
pcDoc->recomputeFeature(pcFeature);
}
else
throw e;
@ -330,8 +331,10 @@ PyObject* initModule()
#include "FemMesh.h"
#include "FemMeshObject.h"
#include "FemPostPipeline.h"
#include "FemMeshPy.h"
#ifdef FC_USE_VTK
#include "FemPostPipeline.h"
#endif
#include <cstdlib>
@ -529,4 +532,4 @@ PyObject* initModule()
}
} // namespace Fem
>>>>>>> Basic implementation of filter framework
>>>>>>> Fem Post: fix vtk include wthout guard