Sync changes from upstream repository

Co-authored-by: Bozo <bozo@mcneel.com>
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: Mikko Oksanen <mikko@mcneel.com>
Co-authored-by: piac <giulio@mcneel.com>
Co-authored-by: Pierre Cuvilliers <pierre@mcneel.com>
Co-authored-by: Rafael Pastrana <arpj@princeton.edu>
Co-authored-by: Steve Baer <steve@mcneel.com>
This commit is contained in:
Bozo the Builder
2023-11-15 13:26:37 -08:00
parent 052b5c981c
commit 417d739f1b
29 changed files with 1109 additions and 322 deletions

View File

@@ -1003,6 +1003,8 @@ const ON_3dmRenderSettingsPrivate& ON_3dmRenderSettingsPrivate::operator = (cons
_sun ->OnInternalXmlChanged(p._sun );
_post_effects ->OnInternalXmlChanged(p._post_effects );
#ifdef _DEBUG // See https://mcneel.myjetbrains.com/youtrack/issue/RH-77284
// Check that all the document objects now have matching properties.
ON_ASSERT(*_ground_plane == *p._ground_plane);
ON_ASSERT(*_dithering == *p._dithering);
@@ -1016,6 +1018,7 @@ const ON_3dmRenderSettingsPrivate& ON_3dmRenderSettingsPrivate::operator = (cons
// We can't check post effects because they may be different in terms of the _is_populated flag.
// After a lot of thinking, I simply cannot figure out how to solve this.
//_ASSERT(*_post_effects == *p._post_effects);
#endif
}
return *this;