Merge branch 'master' into 3d_surface_perf

src/Mod/Cloud/App/CMakeLists.txt

@@ -11,7 +11,7 @@ include_directories(
 
 set(Cloud_LIBS
     FreeCADApp
-    ${OPENSSL_LINK_LIBRARIES}
+    ${OPENSSL_LIBRARIES}
     ${CURL_LIBRARIES}
     ${XercesC_LIBRARIES}
     ${Boost_LIBRARIES}

src/Mod/Cloud/CMakeLists.txt

@@ -29,8 +29,8 @@ elseif(WIN32 AND LIBPACK_FOUND)
       set(OPENSSL_VERSION ${openssl_version_str})
   endif ()   
 else()
-    find_package(OPENSSL REQUIRED)
-endif(UNIX AND NOT APPLE)
+    find_package(OpenSSL REQUIRED)
+endif(UNIX AND APPLE)
 if(OPENSSL_FOUND)
     message(STATUS "openssl-${OPENSSL_VERSION} has been found\n")
 else()

src/Mod/Part/Gui/DlgSettingsObjectColor.ui

@@ -251,6 +251,9 @@
           <property name="text">
            <string>Two-side rendering</string>
           </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
           <property name="prefEntry" stdset="0">
            <cstring>TwoSideRendering</cstring>
           </property>

src/Mod/Part/Gui/ViewProviderExt.cpp

@@ -246,7 +246,7 @@ ViewProviderPartExt::ViewProviderPartExt()
         ("User parameter:BaseApp/Preferences/Mod/Part");
     NormalsFromUV = hPart->GetBool("NormalsFromUVNodes", NormalsFromUV);
 
-    long twoside = hPart->GetBool("TwoSideRendering", false) ? 1 : 0;
+    long twoside = hPart->GetBool("TwoSideRendering", true) ? 1 : 0;
 
     // Let the user define a custom lower limit but a value less than
     // OCCT's epsilon is not allowed

src/Mod/Path/PathScripts/PathDeburr.py

@@ -59,8 +59,7 @@ def toolDepthAndOffset(width, extraDepth, tool):
     toolOffset = float(tool.FlatRadius)
     extraOffset = float(tool.Diameter) / 2 - width if 180 == angle else extraDepth / tan
     offset = toolOffset + extraOffset
-    if offset < 0.0001:
-        offset = 0.01
+    
     return (depth, offset)