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 Lear <dalelear@mcneel.com>
Co-authored-by: Greg Arden <greg-arden@users.noreply.github.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-06-09 14:54:39 -07:00
parent 6b15391c59
commit ea4882ffc9
22 changed files with 267 additions and 103 deletions

View File

@@ -254,7 +254,7 @@ public:
virtual const ON_RenderContent& operator = (const ON_RenderContent&) override;
virtual const ON_RenderMaterial& operator = (const ON_RenderMaterial&);
virtual ON_Material SimulatedMaterial(void) const;
virtual ON_Material ToOnMaterial(void) const;
};
class ON_CLASS ON_RenderEnvironment : public ON_RenderContent
@@ -269,7 +269,7 @@ public:
virtual const ON_RenderContent& operator = (const ON_RenderContent&) override;
virtual const ON_RenderEnvironment& operator = (const ON_RenderEnvironment&);
virtual ON_Environment SimulatedEnvironment(void) const;
virtual ON_Environment ToOnEnvironment(void) const;
};
class ON_CLASS ON_RenderTexture : public ON_RenderContent
@@ -284,7 +284,7 @@ public:
virtual const ON_RenderContent& operator = (const ON_RenderContent&) override;
virtual const ON_RenderTexture& operator = (const ON_RenderTexture&);
virtual ON_Texture SimulatedTexture(void) const;
virtual ON_Texture ToOnTexture(void) const;
};
#endif