diff --git a/Machining.cpp b/Machining.cpp index 1b55645..7436a6f 100644 --- a/Machining.cpp +++ b/Machining.cpp @@ -287,12 +287,12 @@ Machining::ToolPreview( int nEntId, int nFlag) const Frame3d frHead ; m_pGeomDB->GetGroupGlobFrame( nId, frHead) ; Frame3d frRef ; - if ( vtAux.IsSmall()) + if ( vtAux.IsSmall() || AreSameOrOppositeVectorApprox( vtAux, vtDir)) frRef.Set( ptOrig, vtDir) ; else frRef.Set( ptOrig, vtDir, vtAux) ; Frame3d frShow ; - if ( vtBAux.IsSmall()) + if ( vtBAux.IsSmall() || AreSameOrOppositeVectorApprox( vtBAux, vtTool)) frShow.Set( ptEnd + vtTool * GetToolData().m_dLen, vtTool) ; else frShow.Set( ptEnd + vtTool * GetToolData().m_dLen, vtTool, vtBAux) ; diff --git a/Pocketing.cpp b/Pocketing.cpp index 8b820e9..fc31696 100644 --- a/Pocketing.cpp +++ b/Pocketing.cpp @@ -5269,8 +5269,11 @@ Pocketing::AddLeadIn( const Point3d& ptP1, const Point3d& ptStart, const Vector3 return ( AddLinearMove( ptStart, MCH_CL_LEADIN) != GDB_ID_NULL) ; } // altrimenti diretto - else + else { nType = POCKET_LI_NONE ; + if ( m_TParams.m_nType == TT_MILL_NOTIP) + return false ; + } } // Se a scivolo e fattibile if ( nType == POCKET_LI_GLIDE) {