Skip to content

Commit

Permalink
Fix a bug where parameters in the Read/Write nodes could stay visible…
Browse files Browse the repository at this point in the history
… when changing file type
  • Loading branch information
MrKepzie committed Oct 11, 2016
1 parent 2f35bee commit 11e2967
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions Engine/ReadNode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -407,12 +407,12 @@ ReadNodePrivate::cloneGenericKnobs()
} else {
(*it2)->clone( serializedKnob.get() );
}
(*it2)->setSecret( serializedKnob->getIsSecret() );
if ( (*it2)->getDimension() == serializedKnob->getDimension() ) {
//(*it2)->setSecret( serializedKnob->getIsSecret() );
/*if ( (*it2)->getDimension() == serializedKnob->getDimension() ) {
for (int i = 0; i < (*it2)->getDimension(); ++i) {
(*it2)->setEnabled( i, serializedKnob->isEnabled(i) );
}
}
}*/

break;
}
Expand Down Expand Up @@ -473,10 +473,10 @@ ReadNodePrivate::destroyReadNode()
bool isGeneric = isGenericKnob( (*it)->getName(), &mustSerializeKnob );
if (!isGeneric || mustSerializeKnob) {

if (!isGeneric && !(*it)->getDefaultIsSecret()) {
/* if (!isGeneric && !(*it)->getDefaultIsSecret()) {
// Don't save the secret state otherwise some knobs could be invisible when cloning the serialization even if we change format
(*it)->setSecret(false);
}
}*/

boost::shared_ptr<KnobSerialization> s( new KnobSerialization(*it) );
serialized.push_back(s);
Expand Down
8 changes: 4 additions & 4 deletions Engine/WriteNode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -375,12 +375,12 @@ WriteNodePrivate::cloneGenericKnobs()
} else {
(*it2)->clone( serializedKnob.get() );
}
(*it2)->setSecret( serializedKnob->getIsSecret() );
/*(*it2)->setSecret( serializedKnob->getIsSecret() );
if ( (*it2)->getDimension() == serializedKnob->getDimension() ) {
for (int i = 0; i < (*it2)->getDimension(); ++i) {
(*it2)->setEnabled( i, serializedKnob->isEnabled(i) );
}
}
}*/

break;
}
Expand Down Expand Up @@ -441,10 +441,10 @@ WriteNodePrivate::destroyWriteNode()
bool isGeneric = isGenericKnob( (*it)->getName(), &mustSerializeKnob );
if (!isGeneric || mustSerializeKnob) {

if (!isGeneric && !(*it)->getDefaultIsSecret()) {
/*if (!isGeneric && !(*it)->getDefaultIsSecret()) {
// Don't save the secret state otherwise some knobs could be invisible when cloning the serialization even if we change format
(*it)->setSecret(false);
}
}*/
boost::shared_ptr<KnobSerialization> s( new KnobSerialization(*it) );
serialized.push_back(s);
}
Expand Down

0 comments on commit 11e2967

Please sign in to comment.