diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2014-08-18 12:20:56 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-08-18 14:25:01 +0200 |
| commit | 3f9961b6c9fddf1fcf17c83d7fb77f52af5c8fd7 (patch) | |
| tree | 417d43bca6360255d7a4cd8b980a4fadc8290129 /src/render/frontend/qmesh.cpp | |
| parent | 7ae3f3b737fa893da5d12d8ec5aff09e82f6dfb6 (diff) | |
Rename MeshData -> QMeshData
Change-Id: I23a466ebd29666bed1c56f29c6f049544a4eca23
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/frontend/qmesh.cpp')
| -rw-r--r-- | src/render/frontend/qmesh.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/frontend/qmesh.cpp b/src/render/frontend/qmesh.cpp index 4dac20b15..ff3869dde 100644 --- a/src/render/frontend/qmesh.cpp +++ b/src/render/frontend/qmesh.cpp @@ -128,7 +128,7 @@ QAbstractMeshDataPtr MeshFunctor::operator()() { if (m_sourcePath.isEmpty()) { qCWarning(Render::Jobs) << Q_FUNC_INFO << "Mesh is empty, nothing to load"; - return MeshDataPtr(); + return QMeshDataPtr(); } // TO DO : Maybe use Assimp instead of ObjLoader to handle more sources @@ -137,10 +137,10 @@ QAbstractMeshDataPtr MeshFunctor::operator()() qCDebug(Render::Jobs) << Q_FUNC_INFO << "Loading mesh from" << m_sourcePath; if (loader.load(m_sourcePath)) - return MeshDataPtr(loader.mesh()); + return QMeshDataPtr(loader.mesh()); qCWarning(Render::Jobs) << Q_FUNC_INFO << "OBJ load failure for:" << m_sourcePath; - return MeshDataPtr(); + return QMeshDataPtr(); } } // namespace Qt3D |