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

Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code

Browse Source
This commit is contained in:
wmayer 2013-11-07 02:17:04 +01:00
commit a53e93aac7
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README
View File

@ -13,9 +13,9 @@ The interface is built with Qt. FreeCAD runs exactly the same way on Windows, Ma
Linux platforms.
Home page: http://www.freecadweb.org
Documentation wiki: http://www.freecadweb.org/wiki
Forum: http://sourceforge.net/apps/phpbb/free-cad/
Bug tracker: http://www.freecadweb.org/tracker
Documentation wiki: http://www.freecadweb.org/wiki/
Forum: http://www.freecadweb.org/forum/
Bug tracker: http://www.freecadweb.org/tracker/
Git repository: http://sourceforge.net/p/free-cad/code/ci/master/tree/
Installing

2
src/App/Application.cpp
View File

@ -1363,7 +1363,7 @@ void Application::LoadParameters(void)
#if defined(_MSC_VER)
// fix weird error while linking boost (all versions of VC)
// VS2010: https://sourceforge.net/apps/phpbb/free-cad/viewtopic.php?f=4&t=1886&p=12553&hilit=boost%3A%3Afilesystem%3A%3Aget#p12553
// VS2010: http://www.freecadweb.org/forum/viewtopic.php?f=4&t=1886&p=12553&hilit=boost%3A%3Afilesystem%3A%3Aget#p12553
namespace boost { namespace program_options { std::string arg="arg"; } }
#if (defined (BOOST_VERSION) && (BOOST_VERSION >= 104100))
namespace boost { namespace program_options {

2
src/Gui/CommandStd.cpp
View File

@ -543,7 +543,7 @@ StdCmdFreeCADForum::StdCmdFreeCADForum()
void StdCmdFreeCADForum::activated(int iMsg)
{
OpenURLInBrowser("http://sourceforge.net/apps/phpbb/free-cad");
OpenURLInBrowser("http://www.freecadweb.org/forum/");
}
//===========================================================================

2
src/Mod/Part/App/PartFeatures.cpp
View File

@ -356,7 +356,7 @@ App::DocumentObjectExecReturn *Sweep::execute(void)
return new App::DocumentObjectExecReturn("Linked shape is invalid.");
// There is a weird behaviour of BRepOffsetAPI_MakePipeShell when trying to add the wire as is.
// If we re-create the wire then everything works fine.
// https://sourceforge.net/apps/phpbb/free-cad/viewtopic.php?f=10&t=2673&sid=fbcd2ff4589f0b2f79ed899b0b990648#p20268
// http://www.freecadweb.org/forum/viewtopic.php?f=10&t=2673&sid=fbcd2ff4589f0b2f79ed899b0b990648#p20268
if (shape.ShapeType() == TopAbs_FACE) {
TopoDS_Wire faceouterWire = ShapeAnalysis::OuterWire(TopoDS::Face(shape));
profiles.Append(faceouterWire);

2
src/Mod/PartDesign/App/FeatureDraft.cpp
View File

@ -266,7 +266,7 @@ App::DocumentObjectExecReturn *Draft::execute(void)
if (!mkDraft.AddDone()) {
// Note: the function ProblematicShape returns the face on which the error occurred
// Note: mkDraft.Remove() stumbles on a bug in Draft_Modification::Remove() and is
// therefore unusable. See https://sourceforge.net/apps/phpbb/free-cad/viewtopic.php?f=10&t=3209&start=10#p25341
// therefore unusable. See http://www.freecadweb.org/forum/viewtopic.php?f=10&t=3209&start=10#p25341
// The only solution is to discard mkDraft and start over without the current face
// mkDraft.Remove(face);
Base::Console().Error("Adding face failed on %s. Omitted\n", it->c_str());

2
src/Mod/Sketcher/App/freegcs/GCS.cpp
View File

@ -30,7 +30,7 @@
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/connected_components.hpp>
// http://sourceforge.net/apps/phpbb/free-cad/viewtopic.php?f=3&t=4651&start=40
// http://www.freecadweb.org/forum/viewtopic.php?f=3&t=4651&start=40
namespace Eigen {
typedef Matrix<double,-1,-1,0,-1,-1> MatrixdType;

2
src/Mod/TemplatePyMod/MengerSponge.py
View File

@ -2,7 +2,7 @@
# (c) 2012 Werner Mayer LGPL
# The script is based on the work of daxmick at
# https://sourceforge.net/apps/phpbb/free-cad/viewtopic.php?f=3&t=2307
# http://www.freecadweb.org/forum/viewtopic.php?f=3&t=2307
import threading
import Mesh, MeshGui