Sync changes from upstream repository

Co-authored-by: Andrew le Bihan <andy@mcneel.com>
Co-authored-by: croudyj <croudyj@gmail.com>
Co-authored-by: Dale Fugier <dale@mcneel.com>
Co-authored-by: Dan Rigdon-Bel <dan@mcneel.com>
Co-authored-by: Greg Arden <greg@mcneel.com>
Co-authored-by: Jussi Aaltonen <jussi@mcneel.com>
Co-authored-by: kike-garbo <kike@mcneel.com>
Co-authored-by: piac <giulio@mcneel.com>
Co-authored-by: Steve Baer <steve@mcneel.com>
Co-authored-by: Will Pearson <will@mcneel.com>
This commit is contained in:
Bozo The Builder
2022-09-06 10:56:15 -07:00
parent 6a4f9810c9
commit 6486c64975
51 changed files with 3785 additions and 1493 deletions

View File

@@ -101,7 +101,7 @@ void ON_Dithering::SetOn(bool b)
ON_Dithering::Methods ON_Dithering::Method(void) const
{
const auto s = m_impl->GetParameter(XMLPathDit(), ON_DITHERING_METHOD, L"").AsString();
const ON_wString s = m_impl->GetParameter(XMLPathDit(), ON_DITHERING_METHOD, L"").AsString();
if (ON_DITHERING_FLOYD_STEINBERG == s)
return Methods::FloydSteinberg;
@@ -110,7 +110,7 @@ ON_Dithering::Methods ON_Dithering::Method(void) const
void ON_Dithering::SetMethod(Methods m)
{
const auto* wsz = ON_DITHERING_SIMPLE_NOISE;
const wchar_t* wsz = ON_DITHERING_SIMPLE_NOISE;
if (Methods::FloydSteinberg == m)
wsz = ON_DITHERING_FLOYD_STEINBERG;