diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2016-02-29 16:43:37 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-05 16:03:37 +0000 |
commit | c00cadf3853942721cf8eb79b43cba78ceea658b (patch) | |
tree | b0f30a5cc99dee18b4c6c8cbf830f16296c4d077 /src/plugins | |
parent | 6c0eecafa10ea3d8ff288d262bd0368bdf19a9c8 (diff) |
QBlendState cleanup
* renamed to QBlendEquationArguments
* property names expanded
Change-Id: Id25f0181415b4f093f2054238dbf3be26e36ff32
Task-number: QTBUG-51509
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/sceneparsers/gltf/gltfparser.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/sceneparsers/gltf/gltfparser.cpp b/src/plugins/sceneparsers/gltf/gltfparser.cpp index 7df17473f..3deafa796 100644 --- a/src/plugins/sceneparsers/gltf/gltfparser.cpp +++ b/src/plugins/sceneparsers/gltf/gltfparser.cpp @@ -1481,10 +1481,10 @@ QRenderState* GLTFParser::buildState(const QString& functionName, const QJsonVal if (functionName == QStringLiteral("blendFuncSeparate")) { type = GL_BLEND; QBlendStateSeparate *blendState = new QBlendStateSeparate; - blendState->setSrcRGB((QBlendState::Blending)values.at(0).toInt(GL_ONE)); - blendState->setSrcAlpha((QBlendState::Blending)values.at(1).toInt(GL_ONE)); - blendState->setDstRGB((QBlendState::Blending)values.at(2).toInt(GL_ZERO)); - blendState->setDstAlpha((QBlendState::Blending)values.at(3).toInt(GL_ZERO)); + blendState->setSourceRgb((QBlendEquationArguments::Blending)values.at(0).toInt(GL_ONE)); + blendState->setSourceAlpha((QBlendEquationArguments::Blending)values.at(1).toInt(GL_ONE)); + blendState->setDestinationRgb((QBlendEquationArguments::Blending)values.at(2).toInt(GL_ZERO)); + blendState->setDestinationAlpha((QBlendEquationArguments::Blending)values.at(3).toInt(GL_ZERO)); return blendState; } |