Mercurial > hg > svapp
diff framework/SVFileReader.cpp @ 459:74d575708e06 alignment-simple
Branch to test simple FFT model code
author | Chris Cannam |
---|---|
date | Mon, 15 Jun 2015 09:15:55 +0100 |
parents | dc1a360f2b69 |
children | 6f475df6f833 |
line wrap: on
line diff
--- a/framework/SVFileReader.cpp Mon Apr 20 09:21:32 2015 +0100 +++ b/framework/SVFileReader.cpp Mon Jun 15 09:15:55 2015 +0100 @@ -886,12 +886,14 @@ } else { cerr << "WARNING: SV-XML: Unknown model id " << modelId << " in layer definition" << endl; - - // Don't add a layer with an unknown model id - m_document->deleteLayer(layer); - m_layers[id] = layer = 0; - return false; - } + if (!layer->canExistWithoutModel()) { + // Don't add a layer with an unknown model id + // unless it explicitly supports this state + m_document->deleteLayer(layer); + m_layers[id] = layer = 0; + return false; + } + } } if (layer) layer->setProperties(attributes);