From 62006e8b3c5971fd2fde47075ae43d4b6bd642a7 Mon Sep 17 00:00:00 2001 From: bank Date: Thu, 16 Oct 2014 19:39:54 +0400 Subject: [PATCH] Remove unneeded double-initialization of the vars. --- Engine/source/T3D/debris.cpp | 1 - Engine/source/materials/processedFFMaterial.cpp | 2 +- Engine/source/renderInstance/renderBinManager.cpp | 1 - Engine/source/scene/simPath.cpp | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Engine/source/T3D/debris.cpp b/Engine/source/T3D/debris.cpp index 77d5fc603..d8ef4f8fa 100644 --- a/Engine/source/T3D/debris.cpp +++ b/Engine/source/T3D/debris.cpp @@ -99,7 +99,6 @@ DebrisData::DebrisData() friction = 0.2f; numBounces = 0; bounceVariance = 0; - minSpinSpeed = maxSpinSpeed = 0.0; staticOnMaxBounce = false; explodeOnMaxBounce = false; snapOnMaxBounce = false; diff --git a/Engine/source/materials/processedFFMaterial.cpp b/Engine/source/materials/processedFFMaterial.cpp index 500783aee..1a1a4f9e5 100644 --- a/Engine/source/materials/processedFFMaterial.cpp +++ b/Engine/source/materials/processedFFMaterial.cpp @@ -368,7 +368,7 @@ void ProcessedFFMaterial::_initPassStateBlock( RenderPassData *rpd, GFXStateBloc result.blendDefined = true; result.blendEnable = true; result.blendSrc = GFXBlendOne; - result.blendSrc = GFXBlendOne; + result.blendDest = GFXBlendZero; } // This is here for generic FF shader fallbacks. diff --git a/Engine/source/renderInstance/renderBinManager.cpp b/Engine/source/renderInstance/renderBinManager.cpp index 5fb05eebf..df41b634c 100644 --- a/Engine/source/renderInstance/renderBinManager.cpp +++ b/Engine/source/renderInstance/renderBinManager.cpp @@ -122,7 +122,6 @@ void RenderBinManager::internalAddElement(RenderInst* inst) mElementList.increment(); MainSortElem &elem = mElementList.last(); elem.inst = inst; - elem.key = elem.key2 = 0; elem.key = inst->defaultKey; elem.key2 = inst->defaultKey2; diff --git a/Engine/source/scene/simPath.cpp b/Engine/source/scene/simPath.cpp index 1ab5677ec..c25764ad1 100644 --- a/Engine/source/scene/simPath.cpp +++ b/Engine/source/scene/simPath.cpp @@ -371,7 +371,6 @@ Marker::Marker() mTypeMask |= MarkerObjectType; mSeqNum = 0; - mSmoothingType = SmoothingTypeLinear; mMSToNext = 1000; mSmoothingType = SmoothingTypeSpline; mKnotType = KnotTypeNormal;