summaryrefslogtreecommitdiffstats
path: root/src/render/backend/commandexecuter.cpp
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2019-08-07 07:47:31 +0200
committerPaul Lemire <paul.lemire@kdab.com>2019-08-07 07:47:31 +0200
commit8af94d9a048f7d26a8137c3c51dcf47605fcf4b6 (patch)
treee5ef1654a217bf82f0bb3549d1c8f1762f1a9f25 /src/render/backend/commandexecuter.cpp
parent44470868450c440ca874ba585e2b71dfc8e89f1d (diff)
parent7be8029d4c2cd0ce24f0277d6ee87041161edab4 (diff)
Merge remote-tracking branch 'qt-gerrit/dev' into wip/refactor
Diffstat (limited to 'src/render/backend/commandexecuter.cpp')
-rw-r--r--src/render/backend/commandexecuter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/backend/commandexecuter.cpp b/src/render/backend/commandexecuter.cpp
index 54c3548ba..8bccb1437 100644
--- a/src/render/backend/commandexecuter.cpp
+++ b/src/render/backend/commandexecuter.cpp
@@ -265,7 +265,7 @@ QJsonObject parameterPackToJson(const Render::ShaderParameterPack &pack)
for (const auto & texture : textures) {
QJsonObject textureObj;
textureObj.insert(QLatin1String("name"), Render::StringToInt::lookupString(texture.glslNameId));
- textureObj.insert(QLatin1String("id"), qint64(texture.texId.id()));
+ textureObj.insert(QLatin1String("id"), qint64(texture.nodeId.id()));
texturesArray.push_back(textureObj);
}
obj.insert(QLatin1String("textures"), texturesArray);