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

Sync changes from upstream repository

Browse Source 
Co-authored-by: croudyj <croudyj@gmail.com>
Co-authored-by: Dale Fugier <dale@mcneel.com>
Co-authored-by: Dale Lear <dalelear@mcneel.com>
Co-authored-by: Greg Arden <greg@mcneel.com>
Co-authored-by: jlasor <jeff@mcneel.com>
Co-authored-by: Joshua Kennedy <joshuakennedy102@gmail.com>
Co-authored-by: Pierre Cuvilliers <pierre@mcneel.com>
Co-authored-by: Steve Baer <steve@mcneel.com>
This commit is contained in:
Bozo The Builder
2023-05-19 16:14:53 -07:00
parent 2d71f42b17
commit 24b8c988cc
49 changed files with 2582 additions and 893 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
opennurbs_linear_workflow.cpp
View File

@@ -31,7 +31,7 @@ public:
static const wchar_t* XMLPath(void)
{
return ON_RDK_DOCUMENT ON_RDK_SLASH ON_RDK_SETTINGS ON_RDK_SLASH ON_RDK_RENDERING;
return ON_RDK_DOCUMENT ON_XML_SLASH ON_RDK_SETTINGS ON_XML_SLASH ON_RDK_RENDERING;
}
ON_LinearWorkflow::ON_LinearWorkflow()
@@ -61,7 +61,7 @@ const ON_LinearWorkflow& ON_LinearWorkflow::operator = (const ON_LinearWorkflow&
if (this != &lw)
{
// When copying the object, we need to directly copy the underlying XML. So we can't allow
// virtual overrides to execute because they might shadow the real values we want to copy.
// virtual overrides to execute because they might hide the real values we want to copy.
using LW = ON_LinearWorkflow;
LW::SetPreProcessTexturesOn (lw.LW::PreProcessTexturesOn());
LW::SetPreProcessColorsOn (lw.LW::PreProcessColorsOn());
@@ -77,8 +77,8 @@ const ON_LinearWorkflow& ON_LinearWorkflow::operator = (const ON_LinearWorkflow&
bool ON_LinearWorkflow::operator == (const ON_LinearWorkflow& lw) const
{
// When checking equality, we need to directly check the underlying XML. So we can't allow
// virtual overrides to execute because they might shadow the real values we want to check.
// When checking equality, we need to directly check the underlying storage. So we can't allow
// virtual overrides to execute because they might hide the real values we want to check.
using LW = ON_LinearWorkflow;
if (LW::PreProcessTexturesOn() != lw.LW::PreProcessTexturesOn()) return false;
if (LW::PreProcessColorsOn() != lw.LW::PreProcessColorsOn()) return false;
@@ -208,6 +208,6 @@ void* ON_LinearWorkflow::EVF(const wchar_t* func, void* data)
return nullptr;
}
void ON_LinearWorkflow::InvalidateCache(void)
void ON_LinearWorkflow::OnInternalXmlChanged(const ON_LinearWorkflow*)
{
}