lili/opennurbs
1
0
Fork 0
mirror of https://github.com/mcneel/opennurbs.git synced 2026-03-30 07:26:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #54 from mcneel/update-1682516694-8.x

Browse Source 
Sync changes from upstream repository
This commit is contained in:
Steve Baer
2023-04-26 07:19:22 -07:00
committed by GitHub
parent 69212e51f4 711b9eac4e
commit 2d71f42b17
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -1,5 +1,5 @@
cmake_minimum_required (VERSION 3.16)
set(CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD)")
#set(CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD)")
project(opennurbs CXX)
# specify the C++ standard

6
opennurbs_dimension.cpp
View File

@@ -774,7 +774,7 @@ bool ON_DimLinear::GetTextXform(
text_gap = dimstyle->TextGap();
if (dimstyle->MaskFrameType() != ON_TextMask::MaskFrame::NoFrame)
text_gap = dimstyle->TextMask().MaskBorder();
text_gap += dimstyle->TextMask().MaskBorder(); // RH-71452
text_gap *= dimscale;
@@ -2941,7 +2941,7 @@ bool ON_DimAngular::GetTextXform(
text_gap = dimstyle->TextGap();
if (dimstyle->MaskFrameType() != ON_TextMask::MaskFrame::NoFrame)
text_gap = dimstyle->TextMask().MaskBorder();
text_gap += dimstyle->TextMask().MaskBorder(); // RH-71452
text_gap *= dimscale;
bool draw_forward = dimstyle->DrawForward();
@@ -4134,7 +4134,7 @@ bool ON_DimRadial::GetTextXform(
line_height = dimstyle->TextHeight() * dimscale;
text_gap = dimstyle->TextGap();
if (dimstyle->MaskFrameType() != ON_TextMask::MaskFrame::NoFrame)
text_gap = dimstyle->TextMask().MaskBorder();
text_gap += dimstyle->TextMask().MaskBorder(); // RH-71452
text_gap *= dimscale;
landing_length = dimstyle->LeaderLandingLength() * dimscale;

2
opennurbs_leader.cpp
View File

@@ -283,7 +283,7 @@ bool ON_Leader::GetTextXform(
if (maskframe != ON_TextMask::MaskFrame::NoFrame)
{
text_gap = dimstyle->TextMask().MaskBorder();
text_gap += dimstyle->TextMask().MaskBorder(); // RH-71452
}
if (maskframe == ON_TextMask::MaskFrame::CapsuleFrame)

14
opennurbs_public_version.h
View File

@@ -15,9 +15,9 @@
//
#define RMA_VERSION_YEAR 2023
#define RMA_VERSION_MONTH 4
#define RMA_VERSION_DATE 23
#define RMA_VERSION_HOUR 3
#define RMA_VERSION_MINUTE 55
#define RMA_VERSION_DATE 26
#define RMA_VERSION_HOUR 6
#define RMA_VERSION_MINUTE 32
////////////////////////////////////////////////////////////////
//
@@ -35,8 +35,8 @@
// 3 = build system release build
#define RMA_VERSION_BRANCH 0
#define VERSION_WITH_COMMAS 8,0,23113,3550
#define VERSION_WITH_PERIODS 8.0.23113.03550
#define VERSION_WITH_COMMAS 8,0,23116,6320
#define VERSION_WITH_PERIODS 8.0.23116.06320
#define COPYRIGHT "Copyright (C) 1993-2023, Robert McNeel & Associates. All Rights Reserved."
#define SPECIAL_BUILD_DESCRIPTION "Public OpenNURBS C++ 3dm file IO library."
@@ -47,8 +47,8 @@
#define RMA_VERSION_NUMBER_SR_STRING "SR0"
#define RMA_VERSION_NUMBER_SR_WSTRING L"SR0"
#define RMA_VERSION_WITH_PERIODS_STRING "8.0.23113.03550"
#define RMA_VERSION_WITH_PERIODS_WSTRING L"8.0.23113.03550"
#define RMA_VERSION_WITH_PERIODS_STRING "8.0.23116.06320"
#define RMA_VERSION_WITH_PERIODS_WSTRING L"8.0.23116.06320"