lili/opennurbs
1
0
Fork 0
mirror of https://github.com/mcneel/opennurbs.git synced 2026-04-05 03:47:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #86 from mcneel/update-1718611124-8.8

Browse Source 
Sync changes from upstream repository
This commit is contained in:
Luis E. Fraguada
2024-06-17 10:18:10 +02:00
committed by GitHub
parent c59a83ffcc 778eed8b8a
commit 6dce0c19e7
2 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
opennurbs_brep_tools.cpp
View File

@@ -2528,12 +2528,24 @@ bool ON_Brep::MatchTrimEnds(ON_BrepTrim& T0,
if (!nc0->SetEndPoint(ON_3dPoint(p))) if (!nc0->SetEndPoint(ON_3dPoint(p)))
return false; return false;
ON_BrepLoop* pLoop = T0.Loop();
if (pLoop && pLoop != T1.Loop())
pLoop = nullptr;
// clean up T1 flags and cached information // clean up T1 flags and cached information
if(xiso0 && p0.x != p.x) T0.m_iso = ON_Surface::not_iso; if(xiso0 && p0.x != p.x) T0.m_iso = ON_Surface::not_iso;
if(yiso0 && p0.y != p.y) T0.m_iso = ON_Surface::not_iso; if(yiso0 && p0.y != p.y) T0.m_iso = ON_Surface::not_iso;
T0.m_pline.Destroy(); T0.m_pline.Destroy();
if ( T0.m_pbox.IsValid() )
T0.m_pbox.Set( ON_3dPoint(p), true ); if ( T0.m_pbox.IsValid())
{
T0.m_pbox.Set( ON_3dPoint(p), true);
if (pLoop && pLoop->m_pbox.IsValid())
{
pLoop->m_pbox.Set(ON_3dPoint(p), true);
}
}
T0.DestroyCurveTree(); T0.DestroyCurveTree();
if (!nc1->SetStartPoint(ON_3dPoint(p))) if (!nc1->SetStartPoint(ON_3dPoint(p)))
@@ -2543,8 +2555,15 @@ bool ON_Brep::MatchTrimEnds(ON_BrepTrim& T0,
if(xiso1 && p1.x != p.x) T1.m_iso = ON_Surface::not_iso; if(xiso1 && p1.x != p.x) T1.m_iso = ON_Surface::not_iso;
if(yiso1 && p1.y != p.y) T1.m_iso = ON_Surface::not_iso; if(yiso1 && p1.y != p.y) T1.m_iso = ON_Surface::not_iso;
T1.m_pline.Destroy(); T1.m_pline.Destroy();
if ( T1.m_pbox.IsValid() ) if ( T1.m_pbox.IsValid())
T1.m_pbox.Set( ON_3dPoint(p), true ); {
T1.m_pbox.Set( ON_3dPoint(p), true);
if (pLoop && pLoop->m_pbox.IsValid())
{
pLoop->m_pbox.Set(ON_3dPoint(p), true);
}
}
T1.DestroyCurveTree(); T1.DestroyCurveTree();
return true; return true;

12
opennurbs_public_version.h
View File

@@ -15,8 +15,8 @@
// //
#define RMA_VERSION_YEAR 2024 #define RMA_VERSION_YEAR 2024
#define RMA_VERSION_MONTH 6 #define RMA_VERSION_MONTH 6
#define RMA_VERSION_DATE 2 #define RMA_VERSION_DATE 14
#define RMA_VERSION_HOUR 11 #define RMA_VERSION_HOUR 15
#define RMA_VERSION_MINUTE 0 #define RMA_VERSION_MINUTE 0
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
@@ -35,8 +35,8 @@
// 3 = build system release build // 3 = build system release build
#define RMA_VERSION_BRANCH 0 #define RMA_VERSION_BRANCH 0
#define VERSION_WITH_COMMAS 8,8,24154,11000 #define VERSION_WITH_COMMAS 8,8,24166,15000
#define VERSION_WITH_PERIODS 8.8.24154.11000 #define VERSION_WITH_PERIODS 8.8.24166.15000
#define COPYRIGHT "Copyright (C) 1993-2024, Robert McNeel & Associates. All Rights Reserved." #define COPYRIGHT "Copyright (C) 1993-2024, Robert McNeel & Associates. All Rights Reserved."
#define SPECIAL_BUILD_DESCRIPTION "Public OpenNURBS C++ 3dm file IO library." #define SPECIAL_BUILD_DESCRIPTION "Public OpenNURBS C++ 3dm file IO library."
@@ -47,8 +47,8 @@
#define RMA_VERSION_NUMBER_SR_STRING "SR8" #define RMA_VERSION_NUMBER_SR_STRING "SR8"
#define RMA_VERSION_NUMBER_SR_WSTRING L"SR8" #define RMA_VERSION_NUMBER_SR_WSTRING L"SR8"
#define RMA_VERSION_WITH_PERIODS_STRING "8.8.24154.11000" #define RMA_VERSION_WITH_PERIODS_STRING "8.8.24166.15000"
#define RMA_VERSION_WITH_PERIODS_WSTRING L"8.8.24154.11000" #define RMA_VERSION_WITH_PERIODS_WSTRING L"8.8.24166.15000"