From ad786a7134b162fdf4e76265c9490de252db9ffd Mon Sep 17 00:00:00 2001 From: shun-iwasawa Date: Jun 20 2019 06:06:28 +0000 Subject: fix macrofx link (#2620) --- diff --git a/toonz/sources/common/tfx/tmacrofx.cpp b/toonz/sources/common/tfx/tmacrofx.cpp index c643533..2759545 100644 --- a/toonz/sources/common/tfx/tmacrofx.cpp +++ b/toonz/sources/common/tfx/tmacrofx.cpp @@ -492,6 +492,9 @@ void TMacroFx::loadData(TIStream &is) { m_fxs.push_back(fx); } } + // collecting params just after loading nodes since they may need on + // loading "super" tag in case it is linked with another macro fx + collectParams(this); } else if (tagName == "ports") { int i = 0; while (is.matchTag(tagName)) { @@ -533,7 +536,6 @@ void TMacroFx::loadData(TIStream &is) { throw TException("unexpected tag " + tagName); is.closeChild(); } - collectParams(this); } //--------------------------------------------------