Merge from default branch

This commit is contained in:
ffsup2
2010-09-24 22:49:15 +02:00
parent 18d6799cbe
commit dc2350cee8
145 changed files with 23287 additions and 17316 deletions

View File

@@ -90,10 +90,10 @@ void ColorShift::adjusterChanged (Adjuster* a, double newval) {
void ColorShift::setAdjusterBehavior (bool baadd, bool bbadd) {
if (!aAdd && baadd || aAdd && !baadd)
if ((!aAdd && baadd) || (aAdd && !baadd))
ashift->setLimits (-25, 25, 0.1, 0);
if (!bAdd && bbadd || bAdd && !bbadd)
if ((!bAdd && bbadd) || (bAdd && !bbadd))
bshift->setLimits (-25, 25, 0.1, 0);
aAdd = baadd;