Main: TextureUnitState - do not delay loading of Textures

simplifies logic. Behavior now matches GpuProgramUsage
OGRECave · Feb 27, 2018 · 17800a4 · 17800a4
1 parent b8eafb9
commit 17800a4
Show file tree

Hide file tree

Showing 11 changed files with 112 additions and 182 deletions.
diff --git a/OgreMain/include/OgreTextureUnitState.h b/OgreMain/include/OgreTextureUnitState.h
@@ -1176,7 +1176,6 @@ namespace Ogre {
         // Complex members (those that can't be copied using memcpy) are at the end to 
         // allow for fast copying of the basic members.
         //
-        vector<String>::type mFrames;
         mutable vector<TexturePtr>::type mFramePtrs;
         String mName;               ///< Optional name for the TUS.
         String mTextureNameAlias;   ///< Optional alias for texture frames.
@@ -1212,7 +1211,7 @@ namespace Ogre {
         /** Internal method for ensuring the texture for a given frame is loaded. */
         void ensureLoaded(size_t frame) const;
 
-
+        TexturePtr retrieveTexture(const String& name);
     };
 
     /** @} */