Merge branch 'master' into hashremoval

This commit is contained in:
itsmattkc
2022-06-01 10:06:33 -07:00
16 changed files with 123 additions and 77 deletions
+7
View File
@@ -146,6 +146,11 @@ protected:
void ResolveJobs(NodeValue &value, const TimeRange &range);
Block *GetCurrentBlock() const
{
return block_stack_.empty() ? nullptr : block_stack_.back();
}
private:
void PreProcessRow(const TimeRange &range, NodeValueRow &row);
@@ -162,6 +167,8 @@ private:
const Node *transform_now_;
QTransform *transform_;
std::list<Block*> block_stack_;
};
}