summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/data/qcustom3ditem.cpp
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2014-05-14 07:33:23 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2014-05-14 08:30:24 +0300
commitc5e993ad507cc0d56d0e2a62076584d020086ad7 (patch)
tree7c13a0fa99d43d6c6fcb196beb4c664d5db98334 /src/datavisualization/data/qcustom3ditem.cpp
parenta309eb6a29fcdd57f37aef424c30bc13f3fde9b7 (diff)
Use blending for custom items only when needed
Task-number: QTRD-3077 Change-Id: I2406a8fd133943379a5cb1c1c2961a419ef9315f Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/data/qcustom3ditem.cpp')
-rw-r--r--src/datavisualization/data/qcustom3ditem.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/datavisualization/data/qcustom3ditem.cpp b/src/datavisualization/data/qcustom3ditem.cpp
index 69da30bf..70795fdf 100644
--- a/src/datavisualization/data/qcustom3ditem.cpp
+++ b/src/datavisualization/data/qcustom3ditem.cpp
@@ -92,6 +92,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
QCustom3DItem::QCustom3DItem(QObject *parent) :
d_ptr(new QCustom3DItemPrivate(this, parent))
{
+ setTextureImage(QImage());
}
/*!
@@ -203,7 +204,7 @@ void QCustom3DItem::setTextureImage(const QImage &textureImage)
{
if (textureImage.isNull()) {
// Make a solid gray texture
- d_ptr->m_textureImage = QImage(2, 2, QImage::Format_ARGB32);
+ d_ptr->m_textureImage = QImage(2, 2, QImage::Format_RGB32);
d_ptr->m_textureImage.fill(Qt::gray);
} else {
d_ptr->m_textureImage = textureImage;
@@ -227,7 +228,7 @@ void QCustom3DItem::setTextureFile(const QString &textureFile)
if (!textureFile.isEmpty()) {
d_ptr->m_textureImage = QImage(textureFile);
} else {
- d_ptr->m_textureImage = QImage(2, 2, QImage::Format_ARGB32);
+ d_ptr->m_textureImage = QImage(2, 2, QImage::Format_RGB32);
d_ptr->m_textureImage.fill(Qt::gray);
}
emit textureFileChanged(textureFile);