Merge branch 'master' into gtk3-merge-master-b8eb349

This commit is contained in:
Morgan Hardwood
2016-10-10 23:07:41 +02:00
166 changed files with 15898 additions and 2285 deletions

View File

@@ -1121,7 +1121,7 @@ void Retinex::gammaretinexChanged()
if(gammaretinex->get_active_row_number() == 4) {
gam->show();
slope->show();
} else if(gammaretinex->get_active_row_number() != 4) {
} else /*if(gammaretinex->get_active_row_number() != 4)*/ {
gam->hide();
slope->hide();
}