From b226928c6d5d094359b970b64a063b243d4fc84c Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sun, 14 Jun 2015 12:17:55 +0200 Subject: cppcheck: redundantCondition [part1] Change-Id: I21c5340e7b5ec09248b08aa76f43acf883c56cd8 --- drawinglayer/source/processor3d/zbufferprocessor3d.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drawinglayer') diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx index 6ccd174df2dc..f900a68e85c4 100644 --- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx +++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx @@ -296,7 +296,7 @@ private: const bool bTextureActive(mrProcessor.getGeoTexSvx().get() || mrProcessor.getTransparenceGeoTexSvx().get()); mbUseTex = bTextureActive && (mbHasTexCoor || mbHasInvTexCoor || mrProcessor.getSimpleTextureActive()); const bool bUseColorTex(mbUseTex && mrProcessor.getGeoTexSvx().get()); - const bool bNeedNrmOrCol(!bUseColorTex || (bUseColorTex && mrProcessor.getModulate())); + const bool bNeedNrmOrCol(!bUseColorTex || mrProcessor.getModulate()); mbUseNrm = bNeedNrmOrCol && SCANLINE_EMPTY_INDEX != rA.getNormalIndex() && SCANLINE_EMPTY_INDEX != rB.getNormalIndex(); mbUseCol = !mbUseNrm && bNeedNrmOrCol && SCANLINE_EMPTY_INDEX != rA.getColorIndex() && SCANLINE_EMPTY_INDEX != rB.getColorIndex(); -- cgit