diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-21 08:26:29 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-21 08:26:29 +0100 |
| commit | 9f8fc3717508a6b8045f65e6c820692fb67dc450 (patch) | |
| tree | ad426afcaa91f61ecd669fbc416838f108554771 /src/render/texture/texture_p.h | |
| parent | a830a9365832fd52c1849768543a64c55e4cee0a (diff) | |
| parent | cd9059a22604307f483764db134d51b15c540758 (diff) | |
Merge branch '5.9' into dev
Conflicts:
.qmake.conf
src/core/qscene.cpp
src/plugins/sceneparsers/gltf/gltfimporter.cpp
src/plugins/sceneparsers/gltfexport/gltfexporter.cpp
src/render/texture/gltexture.cpp
Change-Id: I7bde0fc0177eae252fef01cc43725fcf69c13a80
Diffstat (limited to 'src/render/texture/texture_p.h')
| -rw-r--r-- | src/render/texture/texture_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/render/texture/texture_p.h b/src/render/texture/texture_p.h index 18f650686..1f3ba729c 100644 --- a/src/render/texture/texture_p.h +++ b/src/render/texture/texture_p.h @@ -157,6 +157,7 @@ public: inline const QVector<HTextureImage>& textureImages() const { return m_textureImages; } inline const QTextureGeneratorPtr& dataGenerator() const { return m_dataFunctor; } + bool isValid() const; private: void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL; |