oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1170 from ThomasWilshaw/build_fix

Browse Source 
Attempt to fix CI build errors.
This commit is contained in:
itsmattkc
2020-07-18 16:55:59 +10:00
committed by GitHub
parent 6309b8fbb7 f4da255b35
commit a772d9e739
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/block/transition/crossdissolve/crossdissolvetransition.h
+1 -1
View File
@@ -42,7 +42,7 @@ public:
virtual ShaderCode GetShaderCode(const QString& shader_id) const override;
protected:
virtual void SampleJobEvent(SampleBufferPtr from_samples, SampleBufferPtr to_samples, SampleBufferPtr out_samples, double time_in) const;
virtual void SampleJobEvent(SampleBufferPtr from_samples, SampleBufferPtr to_samples, SampleBufferPtr out_samples, double time_in) const override;
};
app/window/mainwindow/mainwindow.cpp
+1 -1
View File
@@ -358,7 +358,7 @@ void MainWindow::SetApplicationProgressStatus(ProgressStatus status)
taskbar_interface_->SetProgressState(reinterpret_cast<HWND>(this->winId()), TBPF_NORMAL);
break;
case kProgressNone:
taskbar_interface_->SetProgressState(reinterpret_ cast<HWND>(this->winId()), TBPF_NOPROGRESS);
taskbar_interface_->SetProgressState(reinterpret_cast<HWND>(this->winId()), TBPF_NOPROGRESS);
break;
case kProgressError:
taskbar_interface_->SetProgressState(reinterpret_cast<HWND>(this->winId()), TBPF_ERROR);