merge with dev

This commit is contained in:
Desmis
2017-04-13 11:12:05 +02:00
19 changed files with 568 additions and 239 deletions

View File

@@ -780,7 +780,9 @@ Gtk::Widget* Preferences::getColorManagementPanel ()
const std::vector<Glib::ustring> profiles = rtengine::ICCStore::getInstance ()->getProfiles (rtengine::ICCStore::ProfileType::MONITOR);
for (const auto profile : profiles) {
monProfile->append (profile);
if (profile.find("file:") != 0) {
monProfile->append (profile);
}
}
// same order as the enum