diff options
Diffstat (limited to 'src/adaptationlayers/default/default_rectanglenode.cpp')
| -rw-r--r-- | src/adaptationlayers/default/default_rectanglenode.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/adaptationlayers/default/default_rectanglenode.cpp b/src/adaptationlayers/default/default_rectanglenode.cpp index 0412f2d..b6d5f26 100644 --- a/src/adaptationlayers/default/default_rectanglenode.cpp +++ b/src/adaptationlayers/default/default_rectanglenode.cpp @@ -147,7 +147,7 @@ void DefaultRectangleNode::setOpacity(qreal opacity) if (opacity < 1) { delete m_fill_material; TextureMaterialWithOpacity *material = new TextureMaterialWithOpacity; - if (m_gradient_texture) + if (!m_gradient_texture.isNull()) material->setTexture(m_gradient_texture, m_gradient_is_opaque); material->setLinearFiltering(true); material->setOpacity(opacity); @@ -158,7 +158,7 @@ void DefaultRectangleNode::setOpacity(qreal opacity) if (opacity >= 1) { delete m_fill_material; TextureMaterial *material = new TextureMaterial; - if (m_gradient_texture) + if (!m_gradient_texture.isNull()) material->setTexture(m_gradient_texture, m_gradient_is_opaque); material->setLinearFiltering(true); m_fill_material = material; @@ -679,8 +679,7 @@ void DefaultRectangleNode::updateGradientTexture() line[i] = QColor::fromRgbF(c.redF() * c.alphaF(), c.greenF() * c.alphaF(), c.blueF() * c.alphaF(), c.alphaF()).rgba(); } - m_gradient_texture = m_context->textureManager()->requestUploadedTexture(image, - TextureManager::SynchronousUploadHint); + m_gradient_texture = m_context->textureManager()->upload(image); Q_ASSERT(TextureMaterial::is(m_fill_material) || TextureMaterialWithOpacity::is(m_fill_material)); |