summaryrefslogtreecommitdiffstats
path: root/src/render/materialsystem/material.cpp
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-02-29 10:29:11 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-03-01 19:26:36 +0000
commit8b934a94087e13c4a6989bdf17a75e4c5c09718f (patch)
treedda6fb491ad0729c55689eb1881f5092dbf21e0e /src/render/materialsystem/material.cpp
parent5a2c1a2e611ab0eee3fa966007a851914bb650d6 (diff)
Fix uses of inefficient QList<QNodeId>
QNodeId is a 64-bit type, so holding it in QList on 32-bit platforms is horribly inefficient. Fix by porting to QVector instead. [ChangeLog][Important Behavior Changes] QNodeIds are now passed and accepted in QVectors, not QLists. Change-Id: I3cbe35d639eb2ddf9d106294f542f65b431dc4a4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/materialsystem/material.cpp')
-rw-r--r--src/render/materialsystem/material.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/materialsystem/material.cpp b/src/render/materialsystem/material.cpp
index ca111e012..66dc373a3 100644
--- a/src/render/materialsystem/material.cpp
+++ b/src/render/materialsystem/material.cpp
@@ -116,7 +116,7 @@ void Material::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
markDirty(AbstractRenderer::AllDirty);
}
-QList<Qt3DCore::QNodeId> Material::parameters() const
+QVector<Qt3DCore::QNodeId> Material::parameters() const
{
return m_parameterPack.parameters();
}