df1c36bfb29908d183a8b8b7a9681d6cd630552d
angie
  Mon Aug 18 11:51:32 2014 -0700
Revert "Two problems noticed by Angie in code review.  Redmine #13704."
This reverts commit 936b5b5319541bf59421b258703a4f6af54790e3.

refs #13833

diff --git src/hg/hgTracks/bamTrack.c src/hg/hgTracks/bamTrack.c
index 3f2c2c4..b6ecf69 100644
--- src/hg/hgTracks/bamTrack.c
+++ src/hg/hgTracks/bamTrack.c
@@ -594,31 +594,30 @@
 
 static Color darkBlueColor = 0;
 static Color darkRedColor = 0;
 if (darkRedColor == 0)
     {
     darkRedColor = hvGfxFindColorIx(hvg, 100,0,0);
     darkBlueColor = hvGfxFindColorIx(hvg, 0,0,100);
     }
 if (sameString(colorMode, BAM_COLOR_MODE_STRAND))
     color = (lf->orientation < 0) ? darkRedColor : darkBlueColor;
 else if (lf->filterColor != 0)
     {
     // In bamTrack, lf->filterColor is an RGBA value
     color = lf->filterColor;
     }
-else
     color = colorBySpectrumOrDefault(hvg,tg,lf->grayIx,tg->ixColor);
 
 indelEnabled(cart, tg->tdb, basesPerPixel, &indelShowDoubleInsert, &indelShowQueryInsert,
 	     &indelShowPolyA);
 if (!indelShowDoubleInsert)
     innerLine(hvg, x1, midY, w, color);
 for (sf = lf->components; sf != NULL; sf = sf->next)
     {
     int s = sf->start,  e = sf->end;
     if (e <= s || e < winStart || s > winEnd)
 	continue;
     if (baseQualMode)
         color = colorBySpectrumOrDefault(hvg,tg,sf->grayIx,color);
     baseColorDrawItem(tg, lf, sf->grayIx, hvg, xOff, y, scale, font, s, e, heightPer,
 		      zoomedToCodonLevel, mrnaSeq, sf, psl, drawOpt, MAXPIXELS, winStart, color);