Sync changes from upstream repository

Co-authored-by: croudyj <croudyj@gmail.com>
Co-authored-by: Dale Lear <dalelear@mcneel.com>
Co-authored-by: Greg Arden <greg@mcneel.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-26 13:16:40 -07:00
parent 78002d48dd
commit ecfa0ff6d7
19 changed files with 836 additions and 488 deletions

View File

@@ -1849,6 +1849,8 @@ const ON_PostEffects& ON_3dmRenderSettings::PostEffects(void) const
return const_cast<ON_3dmRenderSettings*>(this)->PostEffects();
}
#ifdef RDK_RENDER_PRESETS
extern ON_UUID uuidRenderPreset_Studio;
extern ON_UUID uuidRenderPreset_Custom;
extern ON_UUID uuidRenderPreset_Exterior;
@@ -1890,6 +1892,7 @@ void ON_3dmRenderSettings::GetRenderPresetList(ON_SimpleArray<ON_UUID>& presets)
presets.Append(uuidRenderPreset_Interior);
presets.Append(uuidRenderPreset_Custom);
}
#endif
//////////////////////////////////////////////////////////////////////////////////////////
//