lili/opennurbs
1
0
Fork 0
mirror of https://github.com/mcneel/opennurbs.git synced 2026-09-04 17:07:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #110 from mcneel/update-1755027660-v8.20.25157.13001

Browse Source 
v8.20.25157.13001
This commit is contained in:
Luis E. Fraguada
2025-08-12 21:48:58 +02:00
committed by GitHub
parent cde5a74c90 07fcb629f6
commit 766f014d04
7 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opennurbs_archive.h
+1 -1
View File
@@ -5332,7 +5332,7 @@ private:
// m_archive_dim_style_table_status values:
// READING:
// 0 = not started
// 1 = BeginWrite3dmDimStyle() has been called,
// 1 = BeginRead3dmDimStyle() has been called,
// m_archive_text_style_table[] is valid,
// and Read3dmDimStyle() can be called.
// 2 = All entries of m_archive_text_style_table[] have been read by Read3dmDimStyle().
opennurbs_array.h
+1 -1
View File
@@ -152,7 +152,7 @@ public:
// Decrements count by removed items. Does
// not change capacity
void RemoveIf(bool predicate(const T& key));
void RemoveIf(bool (*predicate)(const T& key));
// Removes elements for which predicate
// returns true. Decrements count
// by removed items.
opennurbs_array_defs.h
+1 -1
View File
@@ -623,7 +623,7 @@ void ON_SimpleArray<T>::RemoveValue(const T& key)
}
template <class T>
void ON_SimpleArray<T>::RemoveIf(bool predicate(const T& key))
void ON_SimpleArray<T>::RemoveIf(bool (*predicate)(const T& key))
{
int t = 0;
for (int i = 0; i < m_count; i++)
opennurbs_font.cpp
+10 -1
View File
@@ -10752,7 +10752,16 @@ bool ON_Font::Read(
|| (file.PeekAt3dmBigChunkType(&typecode,&big_value) && 1 == typecode)
)
{
ON_WARNING("Should probably be reading an ON_TextStyle");
// Dale Lear 2025 May 8 - RH-87126
// Some older version files are triggering this warning when
// override dimstyles are read. It is true V5 files had a text style table,
// but we didn't expect to encounter override dimstyles in these old
// files. It's not clear to me how these files come into existence,
// but this warning seems to be doing more harm than good. In the xase in the bug,
// the older version files read correctly. When V8 and V9 files are saved, they appear
// to be getting saved correctly.
//
// ON_WARNING("Should probably be reading an ON_TextStyle");
int font_index = -1;
ON_UUID font_id = ON_nil_uuid;
return ReadV5(
opennurbs_instance.cpp
+9
View File
@@ -743,6 +743,15 @@ bool ON_ReferencedComponentSettingsImpl::Internal_UpdateLayer(
// Add more settings here without breaking anything
// 25-Apr-2025 Dale Fugier, https://mcneel.myjetbrains.com/youtrack/issue/RH-68718
const bool visible_in_new_details = ON_ReferencedComponentSettingsImpl::Internal_UpdateBool(
previous_referenced_file_layer.PerViewportIsVisibleInNewDetails(),
reference_file_layer.PerViewportIsVisibleInNewDetails(),
previous_model_layer.PerViewportIsVisibleInNewDetails()
);
model_layer.SetPerViewportIsVisibleInNewDetails(visible_in_new_details);
// Dale Lear August 2017 - RH-39457
// Saved PerViewport settings need to be applied to model_layer
//
opennurbs_public.vcxproj
-1
View File
@@ -626,7 +626,6 @@
<ClCompile Include="opennurbs_zlib_memory.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="opennurbs.rc" />
<ResourceCompile Include="opennurbs_public_version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
opennurbs_public_version.h
+10 -12
View File
@@ -6,7 +6,7 @@
// To update version numbers, edit ..\build\build_dates.msbuild
#define RMA_VERSION_MAJOR 8
#define RMA_VERSION_MINOR 19
#define RMA_VERSION_MINOR 20
////////////////////////////////////////////////////////////////
//
@@ -14,9 +14,9 @@
// first step in each build.
//
#define RMA_VERSION_YEAR 2025
#define RMA_VERSION_MONTH 5
#define RMA_VERSION_DATE 12
#define RMA_VERSION_HOUR 1
#define RMA_VERSION_MONTH 6
#define RMA_VERSION_DATE 6
#define RMA_VERSION_HOUR 13
#define RMA_VERSION_MINUTE 0
////////////////////////////////////////////////////////////////
@@ -35,8 +35,8 @@
// 3 = build system release build
#define RMA_VERSION_BRANCH 0
#define VERSION_WITH_COMMAS 8,19,25132,1000
#define VERSION_WITH_PERIODS 8.19.25132.01000
#define VERSION_WITH_COMMAS 8,20,25157,13000
#define VERSION_WITH_PERIODS 8.20.25157.13000
#define COPYRIGHT "Copyright (C) 1993-2025, Robert McNeel & Associates. All Rights Reserved."
#define SPECIAL_BUILD_DESCRIPTION "Public OpenNURBS C++ 3dm file IO library."
@@ -44,13 +44,11 @@
#define RMA_VERSION_NUMBER_MAJOR_WSTRING L"8"
#define RMA_PREVIOUS_VERSION_NUMBER_MAJOR_WSTRING L"7"
#define RMA_VERSION_NUMBER_SR_STRING "SR19"
#define RMA_VERSION_NUMBER_SR_WSTRING L"SR19"
#define RMA_VERSION_WITH_PERIODS_STRING "8.19.25132.01000"
#define RMA_VERSION_WITH_PERIODS_WSTRING L"8.19.25132.01000"
#define RMA_VERSION_NUMBER_SR_STRING "SR20"
#define RMA_VERSION_NUMBER_SR_WSTRING L"SR20"
#define RMA_VERSION_WITH_PERIODS_STRING "8.20.25157.13000"
#define RMA_VERSION_WITH_PERIODS_WSTRING L"8.20.25157.13000"
// git revision SHA-1 hash as char hexadecimal string
#define RMA_GIT_REVISION_HASH_STRING ""