Merge branch 'master' of https://github.com/olive-editor/olive

2020-11-24 11:04:51 +11:00
parent 1400c313ca 408cf2efb9
commit b4b0cd6be9
4 changed files with 1051 additions and 926 deletions
@@ -59,6 +59,11 @@ ShaderCode CrossDissolveTransition::GetShaderCode(const QString &shader_id) cons
  return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/crossdissolve.frag"), QString());
 }

+void CrossDissolveTransition::ShaderJobEvent(NodeValueDatabase &value, ShaderJob &job) const
+{
+  job.SetAlphaChannelRequired(true);
+}
+
 void CrossDissolveTransition::SampleJobEvent(SampleBufferPtr from_samples, SampleBufferPtr to_samples, SampleBufferPtr out_samples, double time_in) const
 {
  for (int i=0; i<out_samples->sample_count(); i++) {
@@ -43,6 +43,8 @@ public:
  virtual ShaderCode GetShaderCode(const QString& shader_id) const override;

 protected:
+  virtual void ShaderJobEvent(NodeValueDatabase& value, ShaderJob& job) const override;
+
  virtual void SampleJobEvent(SampleBufferPtr from_samples, SampleBufferPtr to_samples, SampleBufferPtr out_samples, double time_in) const override;

 };