Merge branch 'master' into gtk3

This commit is contained in:
Morgan Hardwood
2016-10-16 23:26:51 +02:00
53 changed files with 4404 additions and 857 deletions

View File

@@ -354,7 +354,7 @@ void CurveEditorGroup::setTooltip( Glib::ustring ttip)
void CurveEditorGroup::setBatchMode (bool batchMode)
{
for (std::vector<CurveEditor*>::iterator i = curveEditors.begin(); i != curveEditors.end(); ++i) {
(*i)->curveType->addEntry("curveType-unchanged.png", M("GENERAL_UNCHANGED"));
(*i)->curveType->addEntry("unchanged-18.png", M("GENERAL_UNCHANGED"));
(*i)->curveType->show();
}
}