summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-05-08 17:14:17 +0200
committerPaul Lemire <paul.lemire@kdab.com>2015-05-14 14:10:29 +0000
commit4b42d218cada780a3ff5716b41c9f26f5b2d2d6b (patch)
tree8283a42470ba359a989f9e2b4599e4a156a672cd /src
parent062293f800946feb523dd7abbcd3e06863f8f9b2 (diff)
Unit tests for RenderMesh
Set enabled to true by default on a RenderMesh Change-Id: I269505ab74f05fa81dae5eceef4c0afe24f10031 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/render/backend/rendermesh.cpp3
-rw-r--r--src/render/backend/rendermesh_p.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/render/backend/rendermesh.cpp b/src/render/backend/rendermesh.cpp
index 1fcd65dd4..839de8853 100644
--- a/src/render/backend/rendermesh.cpp
+++ b/src/render/backend/rendermesh.cpp
@@ -57,6 +57,7 @@ namespace Render {
/*!
* \class RenderMesh
+ * \internal
*
* Monitor a frontend Mesh for source changes. If the source is changed,
* the QMeshData returned is either a valid QMeshData corresponding to the source
@@ -70,6 +71,7 @@ RenderMesh::RenderMesh()
: QBackendNode()
, m_meshDirty(true)
, m_meshDataManager(Q_NULLPTR)
+ , m_enabled(true)
{
}
@@ -109,6 +111,7 @@ void RenderMesh::sceneChangeEvent(const QSceneChangePtr &e)
QMeshData *RenderMesh::meshData() const
{
+ Q_ASSERT(m_meshDataManager);
return m_meshDataManager->data(m_meshDataHandle);
}
diff --git a/src/render/backend/rendermesh_p.h b/src/render/backend/rendermesh_p.h
index 0a7f5e1fc..600c141a8 100644
--- a/src/render/backend/rendermesh_p.h
+++ b/src/render/backend/rendermesh_p.h
@@ -62,7 +62,7 @@ class RenderEntity;
class RenderMaterial;
class RenderTechnique;
-class RenderMesh : public QBackendNode
+class Q_AUTOTEST_EXPORT RenderMesh : public QBackendNode
{
public:
RenderMesh();