diff options
| author | Antti Kokko <antti.kokko@qt.io> | 2020-06-25 07:32:53 +0300 |
|---|---|---|
| committer | Antti Kokko <antti.kokko@qt.io> | 2020-06-25 07:32:53 +0300 |
| commit | dd9baa255af6aff800e536781bce369fcc8a3547 (patch) | |
| tree | 224c0d11aa0e82eb609bcff0eacc1d42b95604f9 /src/runtimerender/Qt3DSRenderEffectSystem.cpp | |
| parent | 02e4d56d055d73340d3af1257b908a52aecc320f (diff) | |
| parent | 1c2f256c2afd320bec7e94bfc94760892d6fc9e8 (diff) | |
Merge branch '2.7'
Change-Id: I72499b82b0238c09486177f7c022f5d27896a2c8
Diffstat (limited to 'src/runtimerender/Qt3DSRenderEffectSystem.cpp')
| -rw-r--r-- | src/runtimerender/Qt3DSRenderEffectSystem.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/runtimerender/Qt3DSRenderEffectSystem.cpp b/src/runtimerender/Qt3DSRenderEffectSystem.cpp index faaf4d2..b15d0bc 100644 --- a/src/runtimerender/Qt3DSRenderEffectSystem.cpp +++ b/src/runtimerender/Qt3DSRenderEffectSystem.cpp @@ -1079,8 +1079,8 @@ struct SEffectSystem : public IEffectSystem SImage *image = (*inEffect.m_imageMaps)[inPropertyName]; if (image) { if (image->m_ImagePath != *theStrPtr) { - image->m_ImagePath = *theStrPtr; - image->m_Flags.SetDirty(true); + // Should not happen + QT3DS_ASSERT(false); } else { IOffscreenRenderManager &theOffscreenRenderer( m_Context->GetOffscreenRenderManager()); @@ -1928,10 +1928,12 @@ struct SEffectSystem : public IEffectSystem if ((*inEffect.m_imageMaps)[theDefs[idx].m_Name] != pImage) { (*inEffect.m_imageMaps)[theDefs[idx].m_Name] = pImage; - pImage->m_ImagePath = theDefs[idx].m_ImagePath; + pImage->m_ImagePath = *theStrPtr; pImage->m_ImageShaderName = theDefs[idx].m_Name; pImage->m_VerticalTilingMode = theDefs[idx].m_CoordOp; pImage->m_HorizontalTilingMode = theDefs[idx].m_CoordOp; + pImage->m_Flags.SetDirty(true); + pImage->m_Flags.SetForceLoad(true); } } } else { |