Merge branch 'master' into feature/tool-bit-poc

src/Mod/Draft/importSVG.py

@@ -356,7 +356,7 @@ def getsize(length, mode='discard', base=1):
         tomm = {
             '': 25.4/90,  # default
             'px': 25.4/90,
-            'pt': 1.25 * 25.4/90,
+            'pt': 4.0/3 * 25.4/90,
             'pc': 15 * 25.4/90,
             'mm': 1.0,
             'cm': 10.0,
@@ -369,7 +369,7 @@ def getsize(length, mode='discard', base=1):
         tomm = {
             '': 25.4/96,  # default
             'px': 25.4/96,
-            'pt': 1.25 * 25.4/96,
+            'pt': 4.0/3 * 25.4/96,
             'pc': 15 * 25.4/96,
             'mm': 1.0,
             'cm': 10.0,
@@ -382,7 +382,7 @@ def getsize(length, mode='discard', base=1):
         topx = {
             '': 1.0,  # default
             'px': 1.0,
-            'pt': 1.25,
+            'pt': 4.0/3,
             'pc': 15,
             'mm': 90.0/25.4,
             'cm': 90.0/254.0,
@@ -395,7 +395,7 @@ def getsize(length, mode='discard', base=1):
         topx = {
             '': 1.0,  # default
             'px': 1.0,
-            'pt': 1.25,
+            'pt': 4.0/3,
             'pc': 15,
             'mm': 96.0/25.4,
             'cm': 96.0/254.0,

src/Mod/Part/App/TopoShape.cpp

@@ -832,7 +832,7 @@ void TopoShape::write(const char *FileName) const
     }
     else if (File.hasExtension("stl")) {
         // read brep-file
-        exportStl(File.filePath().c_str(),0);
+        exportStl(File.filePath().c_str(), 0.01);
     }
     else{
         throw Base::FileException("Unknown extension");

src/Mod/Part/App/TopoShapePyImp.cpp

@@ -580,7 +580,7 @@ PyObject*  TopoShapePy::__setstate__(PyObject *args) {
 
 PyObject*  TopoShapePy::exportStl(PyObject *args)
 {
-    double deflection = 0;
+    double deflection = 0.01;
     char* Name;
     if (!PyArg_ParseTuple(args, "et|d","utf-8",&Name,&deflection))
         return NULL;

src/Mod/TechDraw/Gui/Resources/translations/TechDraw_de.ts

@@ -406,7 +406,7 @@
     <message>
       <location filename="../../CommandCreateDims.cpp" line="715"/>
       <source>Insert a new vertical distance dimension</source>
-      <translation>Eine vertikale Abstans-Bemaßung einfügen</translation>
+      <translation>Eine vertikale Abstands-Bemaßung einfügen</translation>
     </message>
   </context>
   <context>