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

Merge branch 'master' into hashremoval

Browse Source
This commit is contained in:
itsmattkc
2022-06-01 10:06:33 -07:00
parent 1e098496be 8939a3aa66
commit 998b9ba482
16 changed files with 123 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/render/renderprocessor.h
+2 -4
View File
@@ -32,7 +32,7 @@ namespace olive {
class RenderProcessor : public NodeTraverser
{
public:
static void Process(RenderTicketPtr ticket, Renderer* render_ctx, DecoderCache* decoder_cache, ShaderCache* shader_cache, QVariant default_shader);
static void Process(RenderTicketPtr ticket, Renderer* render_ctx, DecoderCache* decoder_cache, ShaderCache* shader_cache);
struct RenderedWaveform {
const ClipBlock* block;
@@ -69,7 +69,7 @@ protected:
virtual void ConvertToReferenceSpace(TexturePtr destination, TexturePtr source, const QString &input_cs) override;
private:
RenderProcessor(RenderTicketPtr ticket, Renderer* render_ctx, DecoderCache* decoder_cache, ShaderCache* shader_cache, QVariant default_shader);
RenderProcessor(RenderTicketPtr ticket, Renderer* render_ctx, DecoderCache* decoder_cache, ShaderCache* shader_cache);
TexturePtr GenerateTexture(const rational& time, const rational& frame_length);
@@ -87,8 +87,6 @@ private:
ShaderCache* shader_cache_;
QVariant default_shader_;
};
}