diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-06-19 10:37:25 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-06-19 10:37:25 +0100 |
| commit | 5af4e423be269a9edf3037ff0302d438f077de04 (patch) | |
| tree | a7e5eb78a718921141380658f00f1caedcdb1ba4 /src/render/renderstates/renderstateset.cpp | |
| parent | 02e960493ef9a2f8dc25a06616fbde8fd869d1af (diff) | |
| parent | 01a6bcd086cecef3169e5d79bd72dbb0d1393a0f (diff) | |
Merge branch '5.9' into dev
Conflicts:
src/render/frontend/qcameralens_p.h
src/render/texture/qtexture.cpp
src/render/texture/qtexture_p.h
Change-Id: I20b25cf123f44c96f69ca5f8e042a38692e5cb49
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 c57a4fa0d..dd5f881d8 100644 --- a/src/render/renderstates/renderstateset.cpp +++ b/src/render/renderstates/renderstateset.cpp @@ -254,7 +254,7 @@ StateVariant RenderStateSet::initializeStateFromPeer(const Qt3DRender::QRenderSt { switch (change->renderStateType()) { case AlphaCoverageStateMask: { - return RenderStateSet::createState<AlphaCoverage>(change->isNodeEnabled()); + return RenderStateSet::createState<AlphaCoverage>(); } case AlphaTestMask: { @@ -352,7 +352,7 @@ StateVariant RenderStateSet::initializeStateFromPeer(const Qt3DRender::QRenderSt } case SeamlessCubemapMask: { - return RenderStateSet::createState<SeamlessCubemap>(change->isNodeEnabled()); + return RenderStateSet::createState<SeamlessCubemap>(); } case StencilOpMask: { |