forked from qt-creator/qt-creator
EffectMaker: Use correct names in the effect nodes combobox
Fixes: QDS-11418 Change-Id: I965672aaedd8f730f788215561d3749e9295a983 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
@@ -14,9 +14,9 @@ EffectNode::EffectNode(const QString &qenPath)
|
|||||||
: m_qenPath(qenPath)
|
: m_qenPath(qenPath)
|
||||||
{
|
{
|
||||||
const QFileInfo fileInfo = QFileInfo(qenPath);
|
const QFileInfo fileInfo = QFileInfo(qenPath);
|
||||||
m_name = fileInfo.baseName();
|
|
||||||
|
|
||||||
QString iconPath = QStringLiteral("%1/icon/%2.svg").arg(fileInfo.absolutePath(), m_name);
|
QString iconPath = QStringLiteral("%1/icon/%2.svg").arg(fileInfo.absolutePath(),
|
||||||
|
fileInfo.baseName());
|
||||||
if (!QFileInfo::exists(iconPath)) {
|
if (!QFileInfo::exists(iconPath)) {
|
||||||
QDir parentDir = QDir(fileInfo.absolutePath());
|
QDir parentDir = QDir(fileInfo.absolutePath());
|
||||||
parentDir.cdUp();
|
parentDir.cdUp();
|
||||||
@@ -26,8 +26,10 @@ EffectNode::EffectNode(const QString &qenPath)
|
|||||||
m_iconPath = QUrl::fromLocalFile(iconPath);
|
m_iconPath = QUrl::fromLocalFile(iconPath);
|
||||||
|
|
||||||
CompositionNode node({}, qenPath);
|
CompositionNode node({}, qenPath);
|
||||||
const QList<Uniform *> uniforms = node.uniforms();
|
|
||||||
|
|
||||||
|
m_name = node.name();
|
||||||
|
|
||||||
|
const QList<Uniform *> uniforms = node.uniforms();
|
||||||
for (const Uniform *uniform : uniforms)
|
for (const Uniform *uniform : uniforms)
|
||||||
m_uniformNames.insert(uniform->name());
|
m_uniformNames.insert(uniform->name());
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user