Mercurial > hg > svapp
comparison framework/SVFileReader.cpp @ 337:1e3af7f4fa86 tony_integration
Merge from branch tonioni
author | Chris Cannam |
---|---|
date | Tue, 11 Mar 2014 17:34:53 +0000 |
parents | f72d58d1ccb0 |
children | 4eccff14b4d8 |
comparison
equal
deleted
inserted
replaced
328:28c17ce7a6e9 | 337:1e3af7f4fa86 |
---|---|
323 m_currentTransform.getIdentifier(), | 323 m_currentTransform.getIdentifier(), |
324 message); | 324 message); |
325 } | 325 } |
326 } | 326 } |
327 } else { | 327 } else { |
328 m_document->addDerivedModel | 328 m_document->addAlreadyDerivedModel |
329 (m_currentTransform, | 329 (m_currentTransform, |
330 ModelTransformer::Input(m_currentTransformSource, | 330 ModelTransformer::Input(m_currentTransformSource, |
331 m_currentTransformChannel), | 331 m_currentTransformChannel), |
332 m_currentDerivedModel); | 332 m_currentDerivedModel); |
333 } | 333 } |