diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-01-31 02:58:34 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-01-31 02:58:34 (GMT) |
| commit | 997a0afac3f9b3a7aa2c4a8d351c3697bc91f7aa (patch) | |
| tree | 3b3816d1557746f5f2e3e86a9239821472012024 /src/Preferences.cc | |
| parent | d0de384a7e1642d09726579fdd75f1588cfaada7 (diff) | |
| parent | af0658a8fe441ebb0eb3d238e7055fd592343605 (diff) | |
Merge branch 'master' and fix bugs
Conflicts:
src/openscad.cc
tests/CMakeLists.txt
Diffstat (limited to 'src/Preferences.cc')
| -rw-r--r-- | src/Preferences.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/Preferences.cc b/src/Preferences.cc index e70a2a1..ec66094 100644 --- a/src/Preferences.cc +++ b/src/Preferences.cc @@ -30,7 +30,9 @@ #include <QKeyEvent> #include <QSettings> #include "PolySetCache.h" +#ifdef ENABLE_CGAL #include "CGALCache.h" +#endif Preferences *Preferences::instance = NULL; @@ -75,7 +77,9 @@ Preferences::Preferences(QWidget *parent) : QMainWindow(parent) this->defaultmap["advanced/opencsg_show_warning"] = true; this->defaultmap["advanced/enable_opencsg_opengl1x"] = true; this->defaultmap["advanced/polysetCacheSize"] = uint(PolySetCache::instance()->maxSize()); +#ifdef ENABLE_CGAL this->defaultmap["advanced/cgalCacheSize"] = uint(CGALCache::instance()->maxSize()); +#endif this->defaultmap["advanced/openCSGLimit"] = 2000; this->defaultmap["advanced/forceGoldfeather"] = false; @@ -126,7 +130,9 @@ Preferences::Preferences(QWidget *parent) : QMainWindow(parent) // Advanced pane QValidator *validator = new QIntValidator(this); +#ifdef ENABLE_CGAL this->cgalCacheSizeEdit->setValidator(validator); +#endif this->polysetCacheSizeEdit->setValidator(validator); this->opencsgLimitEdit->setValidator(validator); @@ -198,7 +204,9 @@ void Preferences::on_cgalCacheSizeEdit_textChanged(const QString &text) { QSettings settings; settings.setValue("advanced/cgalCacheSize", text); +#ifdef ENABLE_CGAL CGALCache::instance()->setMaxSize(text.toULong()); +#endif } void Preferences::on_polysetCacheSizeEdit_textChanged(const QString &text) |