From 6f642b339933447ef37e1bc934ee2b710b081e8a Mon Sep 17 00:00:00 2001 From: Jeremy Bullock Date: Sep 04 2017 05:53:20 +0000 Subject: Show Renamed Names in MacroFx (#1355) --- diff --git a/toonz/sources/toonzqt/fxschematicnode.cpp b/toonz/sources/toonzqt/fxschematicnode.cpp index 4b32ac1..01a51ca 100644 --- a/toonz/sources/toonzqt/fxschematicnode.cpp +++ b/toonz/sources/toonzqt/fxschematicnode.cpp @@ -2590,14 +2590,16 @@ FxSchematicNormalFxNode::FxSchematicNormalFxNode(FxSchematicScene *scene, std::vector macroFxs = macroFx->getFxs(); int j; for (j = 0; j < (int)macroFxs.size(); j++) { - TFx *inMacroFx = macroFxs[j].getPointer(); + TFx *inMacroFx = macroFxs[j].getPointer(); + std::wstring fxName = inMacroFx->getName(); + QString qFxName = QString::fromStdWString(fxName); if (inMacroFx->getFxId() == qInMacroFxId.toStdWString()) { int count = inMacroFx->getInputPortCount(); if (count == 1) - qPortName = qInMacroFxId; + qPortName = qFxName; else { qPortName.remove(1, qPortName.size()); - qPortName += ". " + qInMacroFxId; + qPortName += ". " + qFxName; } } }