diff --git a/toonz/sources/toonzlib/txsheetexpr.cpp b/toonz/sources/toonzlib/txsheetexpr.cpp index 0968c3a..66a0f27 100644 --- a/toonz/sources/toonzlib/txsheetexpr.cpp +++ b/toonz/sources/toonzlib/txsheetexpr.cpp @@ -304,10 +304,10 @@ public: TParam *param = fx->getParams()->getParam(i); std::string paramName = ::to_string( TStringTable::translate(fx->getFxType() + "." + param->getName())); - int i = paramName.find(" "); + int i = paramName.find_first_of(" -"); while (i != std::string::npos) { paramName.erase(i, 1); - i = paramName.find(" "); + i = paramName.find_first_of(" -"); } std::string paramNameToCheck = token.getText(); if (paramName == paramNameToCheck || diff --git a/toonz/sources/toonzqt/functiontreeviewer.cpp b/toonz/sources/toonzqt/functiontreeviewer.cpp index 3275f0c..cb14ac6 100644 --- a/toonz/sources/toonzqt/functiontreeviewer.cpp +++ b/toonz/sources/toonzqt/functiontreeviewer.cpp @@ -680,9 +680,12 @@ QString FunctionTreeModel::Channel::getExprRefName() const { return stageGroup->getIdName() + QString(".") + tmpName; } - /*--- Fxパラメータの場合 ---*/ + // expression for fx parameters + // see txsheetexpr.cpp for generation of actual tokens + tmpName.remove(QChar(' '), Qt::CaseInsensitive); tmpName.remove(QChar('/')); + tmpName.remove(QChar('-')); tmpName = tmpName.toLower(); FunctionTreeModel::ChannelGroup *parentGroup =