[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32143] trunk/blender/source/blender/gpu/ intern/gpu_draw.c: show material hardness in solid shaded mode

[Campbell Barton]

Revision: 32143
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32143
Author:   campbellbarton
Date:     2010-09-27 09:01:08 +0200 (Mon, 27 Sep 2010)

Log Message:
-----------
show material hardness in solid shaded mode

Modified Paths:
--------------
    trunk/blender/source/blender/gpu/intern/gpu_draw.c

Modified: trunk/blender/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_draw.c	2010-09-27 06:49:27 UTC (rev 32142)
+++ trunk/blender/source/blender/gpu/intern/gpu_draw.c	2010-09-27 07:01:08 UTC (rev 32143)
@@ -874,6 +874,7 @@
 typedef struct GPUMaterialFixed {
 	float diff[4];
 	float spec[4];
+	int hard;
 } GPUMaterialFixed; 
 
 static struct GPUMaterialState {
@@ -921,7 +922,8 @@
 		smat->spec[1]= bmat->spec * bmat->specg;
 		smat->spec[2]= bmat->spec * bmat->specb;
 		smat->spec[3]= 1.0; /* always 1 */
-		
+		smat->hard= CLAMPIS(bmat->har, 0, 128);
+
 		if(gamma) {
 			linearrgb_to_srgb_v3_v3(smat->diff, smat->diff);
 			linearrgb_to_srgb_v3_v3(smat->spec, smat->spec);
@@ -1104,6 +1106,7 @@
 			/* or do fixed function opengl material */
 			glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, GMS.matbuf[nr].diff);
 			glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, GMS.matbuf[nr].spec);
+			glMateriali(GL_FRONT_AND_BACK, GL_SHININESS, GMS.matbuf[nr].hard);
 		}
 
 		/* set (alpha) blending mode */