diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-06-30 15:51:27 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2014-07-05 14:04:34 +0200 |
| commit | 0972d9b6adce9de5a6a3c614d760a871ba28c8ad (patch) | |
| tree | 095be2c5c3239f8fb53f261659e4ecc15cb3ac5d /src/render/io/gltfparser.cpp | |
| parent | dc88965aa15b9cb725047843fb9874ddc72b3d84 (diff) | |
Renamed Material to QMaterial
Change-Id: I6a3a980411a31ab26dd17a8bc2aa65f67a5209ea
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 7d24a919d..daa78bc42 100644 --- a/src/render/io/gltfparser.cpp +++ b/src/render/io/gltfparser.cpp @@ -46,7 +46,7 @@ #include <Qt3DCore/entity.h> #include <qmesh.h> -#include <material.h> +#include <qmaterial.h> #include <technique.h> #include <shaderprogram.h> #include <effect.h> @@ -452,7 +452,7 @@ CameraLens* GLTFParser::camera(QString id) } } -Material* GLTFParser::material(QString id) +QMaterial* GLTFParser::material(QString id) { parse(); @@ -483,7 +483,7 @@ Material* GLTFParser::material(QString id) m_effectProxies[tname] = eff; } - Material* mat = new Material; + QMaterial* mat = new QMaterial; mat->setEffect(m_effectProxies[tname]); processName(jsonObj, mat); |