diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-06-30 17:30:10 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2014-07-05 14:05:13 +0200 |
| commit | 6b472ae90d418608e502d45a620fd687882620ff (patch) | |
| tree | 3019f337549b954b30e4f0b2eb5706ae725d8551 /src/render/io/gltfparser.cpp | |
| parent | 7e49e45b15a98785074e9d6842d14d13e477cdbd (diff) | |
Renamed Technique to QTechnique
Change-Id: Ia54e752c77cdf6f2b45bc616dc57cd6a0d84166e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/io/gltfparser.cpp')
| -rw-r--r-- | src/render/io/gltfparser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp index 17a5f1b85..60bd0eb1b 100644 --- a/src/render/io/gltfparser.cpp +++ b/src/render/io/gltfparser.cpp @@ -47,7 +47,7 @@ #include <Qt3DCore/entity.h> #include <qmesh.h> #include <qmaterial.h> -#include <technique.h> +#include <qtechnique.h> #include <shaderprogram.h> #include <qeffect.h> #include <Qt3DCore/camera.h> @@ -475,7 +475,7 @@ QMaterial* GLTFParser::material(QString id) return NULL; } - Technique *technique = m_techniques.value(tname); + QTechnique *technique = m_techniques.value(tname); if (!m_effectProxies.contains(tname)) { QEffect* eff = new QEffect; eff->setObjectName(tname); @@ -785,7 +785,7 @@ void GLTFParser::processJSONTexture( QString id, QJsonObject jsonObj) void GLTFParser::processJSONTechnique( QString id, QJsonObject jsonObj ) { - Technique *t = new Technique; + QTechnique *t = new QTechnique; t->setObjectName(id); QHash<QString, Parameter*> paramDict; |