diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-09-28 15:08:45 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-09-28 15:08:45 +0400 |
| commit | 677b9a194f63c7e70f82222eff6ed6baec18b1c5 (patch) | |
| tree | b3fa4bc32d8543036b7a638994f1f5dacef48a52 /source/blender/gpu | |
| parent | 92fd0680cb007d05fdcc9a787ba181bfe1ce7275 (diff) | |
need to set GL_SHININESS to the default value for weight painting.
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index b7698dd3031..af92ecbb44b 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -1061,6 +1061,7 @@ int GPU_enable_material(int nr, void *attribs) glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, diff); glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, spec); + glMateriali(GL_FRONT_AND_BACK, GL_SHININESS, 35); /* blender default */ return 0; } @@ -1323,7 +1324,6 @@ void GPU_state_init(void) /* also called when doing opengl rendering and in the game engine */ float mat_ambient[] = { 0.0, 0.0, 0.0, 0.0 }; float mat_specular[] = { 0.5, 0.5, 0.5, 1.0 }; - float mat_shininess[] = { 35.0 }; int a, x, y; GLubyte pat[32*32]; const GLubyte *patc= pat; @@ -1331,7 +1331,7 @@ void GPU_state_init(void) glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, mat_ambient); glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, mat_specular); glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, mat_specular); - glMaterialfv(GL_FRONT_AND_BACK, GL_SHININESS, mat_shininess); + glMateriali(GL_FRONT_AND_BACK, GL_SHININESS, 35); GPU_default_lights(); |