Fix rebase with master

This commit is contained in:
Matthias Berg
2018-07-17 16:22:59 -04:00
parent 87a08d0c12
commit 10c2e5b956
12 changed files with 66 additions and 55 deletions
+1 -1
View File
@@ -82,7 +82,7 @@ DataLoaderModule::DataLoaderModule()
_showInternalVolumesTrigger.onChange([this](){
// showInternalDataType(DataTypes.volume);
validateDataDirectory();
_loader->createInternalDataItemProperties();
// _loader->createInternalDataItemProperties();
});
_readTransferFunctionPresets.onChange([this](){