[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48250] branches/soc-2012-swiss_cheese/ source/blender/blenlib/intern/pbvh.c: Although it is commented out, replaced glColor/glMaterial with gpuCurrentColor/gpuMaterial

[Jason Wilkins]

Revision: 48250
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48250
Author:   jwilkins
Date:     2012-06-24 22:35:57 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
Although it is commented out, replaced glColor/glMaterial with 
gpuCurrentColor/gpuMaterial

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/pbvh.c

Modified: branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/pbvh.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/pbvh.c 
2012-06-24 21:37:36 UTC (rev 48249)
+++ branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/pbvh.c 
2012-06-24 22:35:57 UTC (rev 48250)
@@ -1597,7 +1597,9 @@
        return hit;
 }
 
-//#include <GL/glew.h>
+#if 0
+#include "GPU_compatibility.h"
+#endif
 
 void BLI_pbvh_node_draw(PBVHNode *node, void *setMaterial)
 {
@@ -1613,9 +1615,9 @@
                for (i = 0; i < 3; ++i)
                        col[i] = (rand() / (float)RAND_MAX) * 0.3 + 0.7;
        }
-       glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, col);
+       gpuMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, col);
 
-       glColor3f(1, 0, 0);
+       gpuCurrentColor3f(1, 0, 0);
 #endif
 
        if (!(node->flag & PBVH_FullyHidden))

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