parent
e546a53e19
commit
b3efd50661
|
@ -528,11 +528,13 @@ ConvertTriangleMesh(M3DTriangleMesh& mesh,
|
|||
}
|
||||
|
||||
|
||||
#if 0
|
||||
static Material::Color
|
||||
toMaterialColor(Color c)
|
||||
{
|
||||
return {c.red(), c.green(), c.blue()};
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
static Model*
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include <QColorDialog>
|
||||
|
||||
|
||||
ColorSwatchWidget::ColorSwatchWidget(const QColor& c, QWidget* parent) :
|
||||
ColorSwatchWidget::ColorSwatchWidget(const QColor& c, QWidget* /*parent*/) :
|
||||
QLabel(nullptr),
|
||||
m_color(c)
|
||||
{
|
||||
|
@ -43,4 +43,3 @@ void ColorSwatchWidget::mouseReleaseEvent(QMouseEvent* /*unused*/)
|
|||
if (c.isValid())
|
||||
setColor(c);
|
||||
}
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@ class Model
|
|||
{
|
||||
public:
|
||||
Model();
|
||||
~Model();
|
||||
virtual ~Model();
|
||||
|
||||
const Material* getMaterial(unsigned int index) const;
|
||||
void setMaterial(unsigned int index, const Material* material);
|
||||
|
|
Loading…
Reference in New Issue