summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/data
diff options
context:
space:
mode:
Diffstat (limited to 'src/datavisualization/data')
-rw-r--r--src/datavisualization/data/customrenderitem_p.h3
-rw-r--r--src/datavisualization/data/qcustom3ditem.cpp5
2 files changed, 6 insertions, 2 deletions
diff --git a/src/datavisualization/data/customrenderitem_p.h b/src/datavisualization/data/customrenderitem_p.h
index 9b6dd167..0632f53e 100644
--- a/src/datavisualization/data/customrenderitem_p.h
+++ b/src/datavisualization/data/customrenderitem_p.h
@@ -47,11 +47,14 @@ public:
inline ObjectHelper *mesh() { return m_object; }
inline void setScaling(const QVector3D &scaling) { m_scaling = scaling; }
inline QVector3D scaling() { return m_scaling; }
+ inline void setBlendNeeded(bool blend) { m_needBlend = blend; }
+ inline bool isBlendNeeded() { return m_needBlend; }
private:
GLuint m_texture;
QVector3D m_scaling;
ObjectHelper *m_object;
+ bool m_needBlend;
};
typedef QVector<CustomRenderItem *> CustomRenderItemArray;
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);