Make cmod::Model destructor virtual (Closes: #8)

+tiny warning fixes
pull/110/head
Hleb Valoshka 2018-10-13 23:03:11 +03:00
parent e546a53e19
commit b3efd50661
3 changed files with 4 additions and 3 deletions

View File

@ -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*

View File

@ -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);
}

View File

@ -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);