diff options
| author | Franck Arrecot <franck.arrecot@kdab.com> | 2016-03-02 11:23:27 +0100 |
|---|---|---|
| committer | Franck Arrecot <franck.arrecot@gmail.com> | 2016-03-11 09:30:09 +0000 |
| commit | 4551f221b5a90a1d14c68c04edcc799d5f8316cc (patch) | |
| tree | 2000182e99851d1ac3f03e2464a635058fa72c94 /src/render/renderstates/renderstateset.cpp | |
| parent | 3adc40a16a947f11db196d3b12be35b675cd1c88 (diff) | |
QStencilOp rename to QStencilOperation
Comment: code still hold a QStencilOpSeparate, might want to rename it to
QStencilOperationSeparate ?
Task-number: QTBUG-51422
Change-Id: I5caf4e26720647ddb9a8b596b9dd33561fb90a08
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/renderstates/renderstateset.cpp')
| -rw-r--r-- | src/render/renderstates/renderstateset.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/renderstates/renderstateset.cpp b/src/render/renderstates/renderstateset.cpp index 02e36b230..b8115a85d 100644 --- a/src/render/renderstates/renderstateset.cpp +++ b/src/render/renderstates/renderstateset.cpp @@ -65,7 +65,7 @@ #include <Qt3DRender/qstenciltestarguments.h> #include <Qt3DRender/qclipplane.h> #include <Qt3DRender/qseamlesscubemap.h> -#include <Qt3DRender/qstencilop.h> +#include <Qt3DRender/qstenciloperation.h> #include <Qt3DRender/qstencilopseparate.h> #include <Qt3DRender/qstencilmask.h> @@ -345,7 +345,7 @@ RenderStateImpl* RenderStateImpl::getOrCreateState(QRenderState *renderState) return getOrCreateRenderStateImpl<SeamlessCubemap>(seamlessCubemap->isEnabled()); } case QRenderState::StencilOp: { - QStencilOp *stencilOp = static_cast<QStencilOp *>(renderState); + QStencilOperation *stencilOp = static_cast<QStencilOperation *>(renderState); const QStencilOpSeparate *front = stencilOp->front(); const QStencilOpSeparate *back = stencilOp->back(); return getOrCreateRenderStateImpl<StencilOp>(front->stencilFail(), front->depthFail(), front->stencilDepthPass(), |