diff --git a/src/App/PropertyStandard.cpp b/src/App/PropertyStandard.cpp index e2ee13c103..6e99f4e782 100644 --- a/src/App/PropertyStandard.cpp +++ b/src/App/PropertyStandard.cpp @@ -2840,7 +2840,7 @@ void PropertyMaterialList::setDiffuseColors(const std::vector& color aboutToSetValue(); setSize(colors.size(), _lValueList[0]); - for (int i = 0; i < colors.size(); i++) { + for (std::size_t i = 0; i < colors.size(); i++) { _lValueList[i].diffuseColor = colors[i]; } hasSetValue(); diff --git a/src/Gui/DlgMaterialPropertiesImp.cpp b/src/Gui/DlgMaterialPropertiesImp.cpp index 305b41c0ae..ff2a1ac1b6 100644 --- a/src/Gui/DlgMaterialPropertiesImp.cpp +++ b/src/Gui/DlgMaterialPropertiesImp.cpp @@ -229,7 +229,7 @@ void DlgMaterialPropertiesImp::onShininessValueChanged(int sh) /** * Reset the colors to the Coin3D defaults */ -void DlgMaterialPropertiesImp::onButtonReset(bool checked) +void DlgMaterialPropertiesImp::onButtonReset() { for (std::vector::iterator it = Objects.begin(); it != Objects.end(); ++it) { App::Property* prop = (*it)->getPropertyByName(material.c_str()); @@ -257,7 +257,7 @@ void DlgMaterialPropertiesImp::onButtonReset(bool checked) /** * Reset the colors to the current default */ -void DlgMaterialPropertiesImp::onButtonDefault(bool checked) +void DlgMaterialPropertiesImp::onButtonDefault() { for (std::vector::iterator it = Objects.begin(); it != Objects.end(); ++it) { App::Property* prop = (*it)->getPropertyByName(material.c_str()); diff --git a/src/Gui/DlgMaterialPropertiesImp.h b/src/Gui/DlgMaterialPropertiesImp.h index 385a4c0259..d0df986877 100644 --- a/src/Gui/DlgMaterialPropertiesImp.h +++ b/src/Gui/DlgMaterialPropertiesImp.h @@ -27,6 +27,7 @@ #include #include #include +#include namespace App { @@ -63,8 +64,8 @@ protected: void onEmissiveColorChanged(); void onSpecularColorChanged(); void onShininessValueChanged(int); - void onButtonReset(bool checked); - void onButtonDefault(bool checked); + void onButtonReset(); + void onButtonDefault(); void setButtonColors(); protected: diff --git a/src/Mod/Material/Gui/AppearancePreview.cpp b/src/Mod/Material/Gui/AppearancePreview.cpp index c72f1c3879..2c6eaa599f 100644 --- a/src/Mod/Material/Gui/AppearancePreview.cpp +++ b/src/Mod/Material/Gui/AppearancePreview.cpp @@ -257,7 +257,9 @@ void AppearancePreview::setTexture(const QImage& image) } void AppearancePreview::setTextureScaling(double scale) -{} +{ + Q_UNUSED(scale) +} void AppearancePreview::resetAmbientColor() { diff --git a/src/Mod/Material/Gui/MaterialsEditor.cpp b/src/Mod/Material/Gui/MaterialsEditor.cpp index c1679de989..1a4c223186 100644 --- a/src/Mod/Material/Gui/MaterialsEditor.cpp +++ b/src/Mod/Material/Gui/MaterialsEditor.cpp @@ -898,7 +898,7 @@ bool MaterialsEditor::updateTexturePreview() const { bool hasImage = false; QImage image; - double scaling = 99.0; + //double scaling = 99.0; if (_material->hasModel(Materials::ModelUUIDs::ModelUUID_Rendering_Texture)) { // First try loading an embedded image try { @@ -939,7 +939,7 @@ bool MaterialsEditor::updateTexturePreview() const try { auto property = _material->getAppearanceProperty(QLatin1String("TextureScaling")); if (!property->isNull()) { - scaling = property->getFloat(); + //scaling = property->getFloat(); // Base::Console().Log("Has 'TextureScaling' = %g\n", scaling); } }