diff options
author | Don Bright <hugh.m.bright@gmail.com> | 2011-12-07 01:08:51 (GMT) |
---|---|---|
committer | Don Bright <hugh.m.bright@gmail.com> | 2011-12-07 01:08:51 (GMT) |
commit | 2c90eaa189cd5bc96ef56e89f2841d36f54d0ae2 (patch) | |
tree | 9f732cf3913312bfb99dc79253bef906864c34b5 /src/MainWindow.h | |
parent | 750f3c8fc94744d6cc4c62de6ac86595cb2b38b6 (diff) | |
parent | bb0ec94290733835df0716531c30460fc5b5210a (diff) |
Merge remote branch 'upstream/master' into cakebaby
Conflicts:
tests/CMakeLists.txt
tests/csgtestcore.cc
Diffstat (limited to 'src/MainWindow.h')
-rw-r--r-- | src/MainWindow.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/MainWindow.h b/src/MainWindow.h index 06332b0..b2d0f60 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -7,6 +7,7 @@ #include "context.h" #include "module.h" #include "Tree.h" +#include "memory.h" #include <vector> class MainWindow : public QMainWindow, public Ui::MainWindow @@ -34,8 +35,8 @@ public: AbstractNode *root_node; // Root if the root modifier (!) is used Tree tree; - class CSGTerm *root_raw_term; // Result of CSG term rendering - CSGTerm *root_norm_term; // Normalized CSG products + shared_ptr<class CSGTerm> root_raw_term; // Result of CSG term rendering + shared_ptr<CSGTerm> root_norm_term; // Normalized CSG products class CSGChain *root_chain; #ifdef ENABLE_CGAL class CGAL_Nef_polyhedron *root_N; @@ -46,9 +47,9 @@ public: #endif class ThrownTogetherRenderer *thrownTogetherRenderer; - std::vector<CSGTerm*> highlight_terms; + std::vector<shared_ptr<CSGTerm> > highlight_terms; CSGChain *highlights_chain; - std::vector<CSGTerm*> background_terms; + std::vector<shared_ptr<CSGTerm> > background_terms; CSGChain *background_chain; QString last_compiled_doc; |