Fix compiler warnings
This commit is contained in:
@@ -2840,7 +2840,7 @@ void PropertyMaterialList::setDiffuseColors(const std::vector<App::Color>& 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();
|
||||
|
||||
@@ -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<ViewProvider*>::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<ViewProvider*>::iterator it = Objects.begin(); it != Objects.end(); ++it) {
|
||||
App::Property* prop = (*it)->getPropertyByName(material.c_str());
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
#include <QDialog>
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
#include <FCGlobal.h>
|
||||
|
||||
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:
|
||||
|
||||
@@ -257,7 +257,9 @@ void AppearancePreview::setTexture(const QImage& image)
|
||||
}
|
||||
|
||||
void AppearancePreview::setTextureScaling(double scale)
|
||||
{}
|
||||
{
|
||||
Q_UNUSED(scale)
|
||||
}
|
||||
|
||||
void AppearancePreview::resetAmbientColor()
|
||||
{
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user