From ba36617aecb6f56d31ce535c1f84500880f3ace7 Mon Sep 17 00:00:00 2001 From: LuisAntonRebollo Date: Thu, 17 Apr 2014 17:36:29 +0200 Subject: [PATCH] Add RenderPassData::mSamplerNames for OpenGL code. Not used on DX9. --- Engine/source/materials/processedMaterial.cpp | 3 +++ Engine/source/materials/processedMaterial.h | 1 + 2 files changed, 4 insertions(+) diff --git a/Engine/source/materials/processedMaterial.cpp b/Engine/source/materials/processedMaterial.cpp index 34ce285a0..9e82c65b1 100644 --- a/Engine/source/materials/processedMaterial.cpp +++ b/Engine/source/materials/processedMaterial.cpp @@ -41,7 +41,10 @@ RenderPassData::RenderPassData() void RenderPassData::reset() { for( U32 i = 0; i < Material::MAX_TEX_PER_PASS; ++ i ) + { destructInPlace( &mTexSlot[ i ] ); + mSamplerNames[ i ].clear(); + } dMemset( &mTexSlot, 0, sizeof(mTexSlot) ); dMemset( &mTexType, 0, sizeof(mTexType) ); diff --git a/Engine/source/materials/processedMaterial.h b/Engine/source/materials/processedMaterial.h index 841825aab..b72422cf9 100644 --- a/Engine/source/materials/processedMaterial.h +++ b/Engine/source/materials/processedMaterial.h @@ -68,6 +68,7 @@ public: } mTexSlot[Material::MAX_TEX_PER_PASS]; U32 mTexType[Material::MAX_TEX_PER_PASS]; + String mSamplerNames[Material::MAX_TEX_PER_PASS]; /// The cubemap to use when the texture type is /// set to Material::Cube.