Merge branch 'master' into pr/1875

This commit is contained in:
itsmattkc
2022-05-05 16:53:57 -07:00
23 changed files with 554 additions and 696 deletions
+1
View File
@@ -284,6 +284,7 @@ void ClipBlock::Retranslate()
SetInputName(kMediaInInput, tr("Media In"));
SetInputName(kSpeedInput, tr("Speed"));
SetInputName(kReverseInput, tr("Reverse"));
SetInputName(kMaintainAudioPitchInput, tr("Maintain Audio Pitch"));
}
void ClipBlock::Hash(QCryptographicHash &hash, const NodeGlobals &globals, const VideoParams &video_params) const
+3
View File
@@ -29,6 +29,9 @@ const QString SubtitleBlock::kTextIn = QStringLiteral("text_in");
SubtitleBlock::SubtitleBlock()
{
AddInput(kTextIn, NodeValue::kText, InputFlags(kInputFlagNotConnectable | kInputFlagNotKeyframable));
// Undo block flag that hides in param view
SetFlags(GetFlags() & ~kDontShowInParamView);
}
QString SubtitleBlock::Name() const