mirror of
https://github.com/mcneel/opennurbs.git
synced 2026-03-17 14:56:02 +08:00
Sync changes from upstream repository
Co-authored-by: Alain <alain@mcneel.com> 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: Dale Lear <dalelear@mcneel.com> Co-authored-by: David Eränen <david.eranen@mcneel.com> Co-authored-by: Greg Arden <greg@mcneel.com> Co-authored-by: Mikko Oksanen <mikko@mcneel.com> Co-authored-by: piac <giulio@mcneel.com> Co-authored-by: Steve Baer <steve@mcneel.com> Co-authored-by: TimHemmelman <tim@mcneel.com> Co-authored-by: Will Pearson <will@mcneel.com>
This commit is contained in:
@@ -1275,9 +1275,16 @@ ON_RenderMaterial::~ON_RenderMaterial()
|
||||
{
|
||||
}
|
||||
|
||||
void ON_RenderMaterial::operator = (const ON_RenderMaterial& mat)
|
||||
const ON_RenderContent& ON_RenderMaterial::operator = (const ON_RenderContent& c)
|
||||
{
|
||||
ON_RenderContent::operator = (c);
|
||||
return *this;
|
||||
}
|
||||
|
||||
const ON_RenderMaterial& ON_RenderMaterial::operator = (const ON_RenderMaterial& mat)
|
||||
{
|
||||
ON_RenderContent::operator = (mat);
|
||||
return *this;
|
||||
}
|
||||
|
||||
ON_XMLVariant ParamHelper(const ON_XMLParameters& p, const wchar_t* name)
|
||||
@@ -1422,8 +1429,16 @@ ON_RenderEnvironment::~ON_RenderEnvironment()
|
||||
{
|
||||
}
|
||||
|
||||
void ON_RenderEnvironment::operator = (const ON_RenderEnvironment& env)
|
||||
const ON_RenderContent& ON_RenderEnvironment::operator = (const ON_RenderContent& c)
|
||||
{
|
||||
ON_RenderContent::operator = (c);
|
||||
return *this;
|
||||
}
|
||||
|
||||
const ON_RenderEnvironment& ON_RenderEnvironment::operator = (const ON_RenderEnvironment& env)
|
||||
{
|
||||
ON_RenderContent::operator = (env);
|
||||
return *this;
|
||||
}
|
||||
|
||||
ON_Environment ON_RenderEnvironment::SimulatedEnvironment(void) const
|
||||
@@ -1479,8 +1494,16 @@ ON_RenderTexture::~ON_RenderTexture()
|
||||
{
|
||||
}
|
||||
|
||||
void ON_RenderTexture::operator = (const ON_RenderTexture& tex)
|
||||
const ON_RenderContent& ON_RenderTexture::operator = (const ON_RenderContent& c)
|
||||
{
|
||||
ON_RenderContent::operator = (c);
|
||||
return *this;
|
||||
}
|
||||
|
||||
const ON_RenderTexture& ON_RenderTexture::operator = (const ON_RenderTexture& tex)
|
||||
{
|
||||
ON_RenderContent::operator = (tex);
|
||||
return *this;
|
||||
}
|
||||
|
||||
ON_Texture ON_RenderTexture::SimulatedTexture(void) const
|
||||
|
||||
Reference in New Issue
Block a user