Merge remote-tracking branch 'refs/remotes/origin/jriegel/NewWinBuild' into jriegel/review-NewLibPack

Conflicts: src/3rdParty/salomesmesh/CMakeLists.txt
2014-08-27 15:39:00 +02:00
parent 346e5c6a77 58a7be992b
commit c1f0f70b88
73 changed files with 12578 additions and 917 deletions
--- a/src/App/FeaturePython.cpp
+++ b/src/App/FeaturePython.cpp
@@ -54,7 +54,7 @@ DocumentObjectExecReturn *FeaturePythonImp::execute()
            Py::Object feature = static_cast<PropertyPythonObject*>(proxy)->getValue();
            if (feature.hasAttr("__object__")) {
                Py::Callable method(feature.getAttr(std::string("execute")));
-                Py::Tuple args(0);
+				Py::Tuple args;
                method.apply(args);
            }
            else {