Revision: 16202
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16202
Author: blendix
Date: 2008-08-21 15:40:40 +0200 (Thu, 21 Aug 2008)
Log Message:
-----------
Apricot Branch: fix for bug #17435, only first 3 texture slots were
being used for finding second uv coordinate layer.
Modified Paths:
--------------
branches/apricot/source/gameengine/Ketsji/BL_Material.h
branches/apricot/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/apricot/source/gameengine/Rasterizer/RAS_TexVert.h
Modified: branches/apricot/source/gameengine/Ketsji/BL_Material.h
===================================================================
--- branches/apricot/source/gameengine/Ketsji/BL_Material.h 2008-08-21
07:59:18 UTC (rev 16201)
+++ branches/apricot/source/gameengine/Ketsji/BL_Material.h 2008-08-21
13:40:40 UTC (rev 16202)
@@ -18,9 +18,9 @@
this will default to users available units
to build with more available, just increment this value
although the more you add the slower the search time will be.
- we will go for three, which should be enough
+ we will go for eight, which should be enough
*/
-#define MAXTEX 3 //match in RAS_TexVert &
RAS_OpenGLRasterizer
+#define MAXTEX 8 //match in RAS_TexVert &
RAS_OpenGLRasterizer
// different mapping modes
class BL_Mapping
Modified:
branches/apricot/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
===================================================================
---
branches/apricot/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
2008-08-21 07:59:18 UTC (rev 16201)
+++
branches/apricot/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
2008-08-21 13:40:40 UTC (rev 16202)
@@ -41,7 +41,7 @@
#include "RAS_MaterialBucket.h"
#include "RAS_ICanvas.h"
-#define RAS_MAX_TEXCO 3 // match in BL_Material
+#define RAS_MAX_TEXCO 8 // match in BL_Material
#define RAS_MAX_ATTRIB 16 // match in BL_BlenderShader
struct OglDebugLine
Modified: branches/apricot/source/gameengine/Rasterizer/RAS_TexVert.h
===================================================================
--- branches/apricot/source/gameengine/Rasterizer/RAS_TexVert.h 2008-08-21
07:59:18 UTC (rev 16201)
+++ branches/apricot/source/gameengine/Rasterizer/RAS_TexVert.h 2008-08-21
13:40:40 UTC (rev 16202)
@@ -57,7 +57,7 @@
enum {
FLAT = 1,
SECOND_UV = 2,
- MAX_UNIT = 3
+ MAX_UNIT = 8
};
short getFlag() const;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
