From 350d3e67022725500b9e0db12d63ab39f03d4da7 Mon Sep 17 00:00:00 2001 From: Areloch Date: Sun, 20 Sep 2020 01:19:08 -0500 Subject: [PATCH] Fixes 2 minor mistake corrections --- Engine/source/gui/controls/guiMLTextCtrl.cpp | 3 ++- Engine/source/gui/controls/guiMLTextCtrl.h | 2 +- Engine/source/renderInstance/renderTranslucentMgr.cpp | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Engine/source/gui/controls/guiMLTextCtrl.cpp b/Engine/source/gui/controls/guiMLTextCtrl.cpp index 67ce7beaf..85d093f26 100644 --- a/Engine/source/gui/controls/guiMLTextCtrl.cpp +++ b/Engine/source/gui/controls/guiMLTextCtrl.cpp @@ -528,7 +528,8 @@ void GuiMLTextCtrl::inspectPostApply() setText(mInitialText, dStrlen(mInitialText)); - mLineSpacingPixels = 0; + if (mLineSpacingPixels < 0) + mLineSpacingPixels = 0; } diff --git a/Engine/source/gui/controls/guiMLTextCtrl.h b/Engine/source/gui/controls/guiMLTextCtrl.h index 3aefa22e7..8eb3ff263 100644 --- a/Engine/source/gui/controls/guiMLTextCtrl.h +++ b/Engine/source/gui/controls/guiMLTextCtrl.h @@ -253,7 +253,7 @@ class GuiMLTextCtrl : public GuiControl Resource mFont; // Console settable parameters - U32 mLineSpacingPixels; + S32 mLineSpacingPixels; bool mAllowColorChars; bool mUseURLMouseCursor; diff --git a/Engine/source/renderInstance/renderTranslucentMgr.cpp b/Engine/source/renderInstance/renderTranslucentMgr.cpp index 223ebc22e..94598262d 100644 --- a/Engine/source/renderInstance/renderTranslucentMgr.cpp +++ b/Engine/source/renderInstance/renderTranslucentMgr.cpp @@ -306,6 +306,7 @@ void RenderTranslucentMgr::render( SceneRenderState *state ) if (passRI->accuTex != lastAccuTex) { sgData.accuTex = passRI->accuTex; + lastAccuTex = passRI->accuTex; dirty = true; }