Skip to content

Commit 3209a5b

Browse files
authored
unify(matpass): Merge WW3D2 matpass code (#1982)
This fixes a runtime crash in Generals due to incomplete code merging
1 parent d2625f0 commit 3209a5b

File tree

1 file changed

+5
-5
lines changed
  • Generals/Code/Libraries/Source/WWVegas/WW3D2

1 file changed

+5
-5
lines changed

Generals/Code/Libraries/Source/WWVegas/WW3D2/matpass.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,13 @@
2626
* *
2727
* Original Author:: Greg Hjelstrom *
2828
* *
29-
* $Author:: Greg_h $*
29+
* Author : Kenny Mitchell *
3030
* *
31-
* $Modtime:: 5/13/01 11:25a $*
31+
* $Modtime:: 06/27/02 1:27p $*
3232
* *
33-
* $Revision:: 5 $*
33+
* $Revision:: 6 $*
3434
* *
35+
* 06/27/02 KM Texture class abstraction *
3536
*---------------------------------------------------------------------------------------------*
3637
* Functions: *
3738
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
@@ -41,7 +42,6 @@
4142
#include "always.h"
4243
#include "shader.h"
4344

44-
4545
class TextureClass;
4646
class VertexMaterialClass;
4747
class MeshModelClass;
@@ -93,7 +93,7 @@ class MaterialPassClass : public RefCountClass
9393

9494
protected:
9595

96-
enum { MAX_TEX_STAGES = 2 };
96+
enum { MAX_TEX_STAGES = 8 };
9797

9898
TextureClass * Texture[MAX_TEX_STAGES];
9999
ShaderClass Shader;

0 commit comments

Comments
 (0)