[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15240] trunk/blender/source/gameengine/ BlenderRoutines/KX_BlenderGL.cpp: Material color was always overriding OBCOL for blender text.

[Campbell Barton]

Revision: 15240
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15240
Author:   campbellbarton
Date:     2008-06-16 11:16:04 +0200 (Mon, 16 Jun 2008)

Log Message:
-----------
Material color was always overriding OBCOL for blender text.

Modified Paths:
--------------
    trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp

Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp    
2008-06-16 07:15:09 UTC (rev 15239)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp    
2008-06-16 09:16:04 UTC (rev 15240)
@@ -133,7 +133,12 @@
                                characters = 0;
                        }
 
-                       if(!col) glColor3f(1.0f, 1.0f, 1.0f);
+                       /* When OBCOL flag is on the color is set in 
IndexPrimitives_3DText */                  
+                       if (tface->mode & TF_OBCOL) { /* Color has been set */
+                               col= NULL;
+                       } else {
+                               if(!col) glColor3f(1.0f, 1.0f, 1.0f);           
        
+                       }
 
                        glPushMatrix();
                        for (index = 0; index < characters; index++) {


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs