Merge remote-tracking branch 'parallax/master' into parallax-update

Signed-off-by: Matt Liberty <[email protected]>
This commit is contained in:
Matt Liberty
2026-02-25 16:09:34 +00:00
9 changed files with 1358 additions and 1349 deletions
+2 -3
View File
@@ -1596,9 +1596,8 @@ protected:
void setThreadCount1(int thread_count);
void updateLibertyScenes();
void updateSceneLiberty(Scene *scene,
const StdStringSeq &liberty_files,
const MinMax *min_max);
LibertyLibrary *findLibertyFileBasename(const std::string &filename) const;
const StdStringSeq &liberty_min_files,
const StdStringSeq &liberty_max_files);
Scene *makeScene(const std::string &name,
Mode *mode,