diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2020-09-24 12:45:10 +0300 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2020-10-14 12:25:54 +0300 |
| commit | ef7e3400211d275077596dd848898adb876efb6e (patch) | |
| tree | f712f9c28502deb6794e70e2ca6fd77e4d938703 /src/uipparser | |
| parent | 830d97fda90783e278c0e0ea99ec286e6e7b96e2 (diff) | |
Use images with dynamic object textures
Task-number: QT3DS-4063
Change-Id: Ia07f21be65ebda9733773504eb2e0ddce4009fab
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/uipparser')
| -rw-r--r-- | src/uipparser/Qt3DSUIPParserImpl.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/uipparser/Qt3DSUIPParserImpl.cpp b/src/uipparser/Qt3DSUIPParserImpl.cpp index 8be40d7..e9f8104 100644 --- a/src/uipparser/Qt3DSUIPParserImpl.cpp +++ b/src/uipparser/Qt3DSUIPParserImpl.cpp @@ -2344,14 +2344,16 @@ BOOL CUIPParserImpl::LoadSlideElementAttrs(IPresentation &inPresentation, bool m const char8_t *theAttValue = ""; bool hasAtt = inReader.UnregisteredAtt(prop.m_Name, theAttValue); if (hasAtt && !IsTrivial(theAttValue)) { - m_sourcePathsById[QLatin1Char('#') + QString::fromUtf8(theRef)].append( - QString::fromUtf8(theAttValue)); - if (!isInsideMaterialContainer) { - AddSourcePath(theAttValue, false); - theBuilder.AddSourcePath(theAttValue); + if (theAttValue[0] != '#') { + m_sourcePathsById[QLatin1Char('#') + QString::fromUtf8(theRef)].append( + QString::fromUtf8(theAttValue)); + if (!isInsideMaterialContainer) { + AddSourcePath(theAttValue, false); + theBuilder.AddSourcePath(theAttValue); + } + if (!masterSlide || isInsideMaterialContainer) + m_slideSourcePaths.push_back(QString::fromLatin1(theAttValue)); } - if (!masterSlide || isInsideMaterialContainer) - m_slideSourcePaths.push_back(QString::fromLatin1(theAttValue)); } } } |