From 8aa03a4ac9bc74cfa3d0d10eccad70d84030e293 Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Sun, 26 Apr 2020 16:47:29 -0500
Subject: [PATCH] uninitialized variables-renderinstance

(cherry picked from commit dcbc22bf8450250f192ae56b303affd760f63db1)
---
 Engine/source/renderInstance/renderDeferredMgr.cpp |  2 +-
 Engine/source/renderInstance/renderProbeMgr.cpp    | 13 ++++++++++++-
 Engine/source/renderInstance/renderProbeMgr.h      |  4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Engine/source/renderInstance/renderDeferredMgr.cpp b/Engine/source/renderInstance/renderDeferredMgr.cpp
index 8632b36a3..8d34c809d 100644
--- a/Engine/source/renderInstance/renderDeferredMgr.cpp
+++ b/Engine/source/renderInstance/renderDeferredMgr.cpp
@@ -584,7 +584,7 @@ const GFXStateBlockDesc & RenderDeferredMgr::getOpaqueStencilTestDesc()
 
 
 ProcessedDeferredMaterial::ProcessedDeferredMaterial( Material& mat, const RenderDeferredMgr *deferredMgr )
-: Parent(mat), mDeferredMgr(deferredMgr)
+: Parent(mat), mDeferredMgr(deferredMgr), mIsLightmappedGeometry(false)
 {
 
 }
diff --git a/Engine/source/renderInstance/renderProbeMgr.cpp b/Engine/source/renderInstance/renderProbeMgr.cpp
index 4d7bf39c7..c77cc3e3e 100644
--- a/Engine/source/renderInstance/renderProbeMgr.cpp
+++ b/Engine/source/renderInstance/renderProbeMgr.cpp
@@ -213,6 +213,7 @@ RenderProbeMgr::RenderProbeMgr()
    smProbeManager = this;
 
    mCubeMapCount = 0;
+   mCubeSlotCount = PROBE_ARRAY_SLOT_BUFFER_SIZE;
 
    for (U32 i = 0; i < PROBE_MAX_COUNT; i++)
    {
@@ -222,7 +223,17 @@ RenderProbeMgr::RenderProbeMgr()
 
 RenderProbeMgr::RenderProbeMgr(RenderInstType riType, F32 renderOrder, F32 processAddOrder)
  : RenderBinManager(riType, renderOrder, processAddOrder)
-{  
+{
+   mCubeMapCount = 0;
+   dMemset(mCubeMapSlots, false, sizeof(mCubeMapSlots));
+   mCubeSlotCount = PROBE_ARRAY_SLOT_BUFFER_SIZE;
+   mDefaultSkyLight = nullptr;
+   mEffectiveProbeCount = 0;
+   mHasSkylight = false;
+   mSkylightCubemapIdx = -1;
+   mLastConstants = nullptr;
+   mMipCount = 0;
+   mProbesDirty = false;
 }
 
 RenderProbeMgr::~RenderProbeMgr()
diff --git a/Engine/source/renderInstance/renderProbeMgr.h b/Engine/source/renderInstance/renderProbeMgr.h
index 50391ff20..24faccb65 100644
--- a/Engine/source/renderInstance/renderProbeMgr.h
+++ b/Engine/source/renderInstance/renderProbeMgr.h
@@ -100,8 +100,6 @@ struct ProbeRenderInst
 
    U32 mProbeIdx;
 
-   F32 mMultiplier;
-
 public:
 
    ProbeRenderInst();
@@ -202,6 +200,8 @@ struct ProbeDataSet
       dMemset(refBoxMaxArray.getBuffer(), 0, refBoxMaxArray.getBufferSize());
       dMemset(probeRefPositionArray.getBuffer(), 0, probeRefPositionArray.getBufferSize());
       dMemset(probeConfigArray.getBuffer(), 0, probeConfigArray.getBufferSize());
+      skyLightIdx = -1;
+      effectiveProbeCount = 0;
    }
 };