Merge pull request #4178 from huffman/fix-mesh-textures

Fix failing QMetaObject::invokeMethod call
This commit is contained in:
Brad Hefta-Gaub 2015-01-27 14:00:58 -08:00
commit 2403533e0e

View file

@ -490,7 +490,7 @@ void ImageReader::run() {
averageColor.setRgb(redTotal / imageArea, greenTotal / imageArea, blueTotal / imageArea);
}
QMetaObject::invokeMethod(texture.data(), "setImage", Q_ARG(const QImage&, image), Q_ARG(bool, false),
Q_ARG(const QColor&, averageColor));
Q_ARG(const QColor&, averageColor), Q_ARG(int, originalWidth), Q_ARG(int, originalHeight));
return;
}
if (image.format() != QImage::Format_ARGB32) {