Merge branch 'tm_opencsg' into lm_tm_hollowing

This commit is contained in:
tamasmeszaros 2020-01-08 08:58:21 +01:00
commit 6b482be74e
7 changed files with 439 additions and 207 deletions

View file

@ -62,7 +62,6 @@ protected:
// Launched when the job is finished. It refreshes the 3Dscene by def.
virtual void finalize() { m_finalized = true; }
bool is_finalized() const { return m_finalized; }
public:
Job(std::shared_ptr<ProgressIndicator> pri) : m_progress(pri)
@ -89,6 +88,8 @@ public:
});
}
bool is_finalized() const { return m_finalized; }
Job(const Job &) = delete;
Job(Job &&) = delete;
Job &operator=(const Job &) = delete;