diff options
| author | Marius Kintel <marius@kintel.net> | 2014-01-03 18:27:22 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2014-01-03 18:27:22 (GMT) |
| commit | c4a1d855f11d076d30e98f799315446da021514a (patch) | |
| tree | 2e772c6cba0f459641aceb35ee303d6e6a778c48 | |
| parent | bee5233a916055d41bb4ee425f5df25b80f50f16 (diff) | |
| parent | c350f428b75ca8c9e85616aff50cdbe5e9033331 (diff) | |
Merge branch 'vector-concat' of git://github.com/t-paul/openscad into t-paul-vector-concat
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | src/Preferences.cc | 7 |
2 files changed, 8 insertions, 4 deletions
@@ -4,6 +4,7 @@ *.tar* Makefile objects +.gdbinit /*.stl /*.dxf /lexer_lex.cpp @@ -15,3 +16,7 @@ parser_yacc.h /nbproject /openscad /tests/openscad_nogui +testdata/scad/features/import_dxf-tests.scad +testdata/scad/features/import_stl-tests.scad +testdata/scad/misc/include-tests.scad +testdata/scad/misc/use-tests.scad diff --git a/src/Preferences.cc b/src/Preferences.cc index b63ca7b..92f11c7 100644 --- a/src/Preferences.cc +++ b/src/Preferences.cc @@ -211,10 +211,9 @@ void Preferences::featuresCheckBoxToggled(bool state) /** * Setup feature GUI and synchronize the Qt settings with the feature values. * - * In case a feature was enabled on the commandline this will have precedence - * and cause the checkbox in the settings GUI to be not editable. - * Otherwise the value from the Qt settings is pushed into the feature state - * and the checkbox is initialized accordingly. + * When running in GUI mode, the feature setting that might have been set + * from commandline is ignored. This always uses the value coming from the + * QSettings. */ void Preferences::setupFeaturesPage() |