diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-16 02:58:12 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-16 02:58:12 +0400 |
| commit | 7c2fb421957da7d2e167283cd6c95a1a7a26c7f7 (patch) | |
| tree | ac422765c21190baae07021c19d31ec8526fc2cd /source/blender/gpu | |
| parent | a8ce1a15860297e530cb71529066758eca8fa02b (diff) | |
2.5: Defaults
* Wave modifier speed 0.5 -> 0.25.
* Particles even and random distribution on.
* Particles normal velocity 0.0 -> 1.0.
* Particles size 1.0 -> 0.05.
* Particles draw emitter and material color on.
* Field strength 0.0 -> 1.0
* Object drawing without material was not consistent
with default material.
* Panel title 13 -> 12 points.
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index efb7d688a49..1031a240470 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -854,14 +854,14 @@ void GPU_begin_object_materials(View3D *v3d, RegionView3D *rv3d, Scene *scene, O /* no materials assigned? */ if(ob->totcol==0) { - GMS.matbuf[0][0][0]= defmaterial.r; - GMS.matbuf[0][0][1]= defmaterial.g; - GMS.matbuf[0][0][2]= defmaterial.b; + GMS.matbuf[0][0][0]= (defmaterial.ref+defmaterial.emit)*defmaterial.r; + GMS.matbuf[0][0][1]= (defmaterial.ref+defmaterial.emit)*defmaterial.g; + GMS.matbuf[0][0][2]= (defmaterial.ref+defmaterial.emit)*defmaterial.b; GMS.matbuf[0][0][3]= 1.0; - GMS.matbuf[0][1][0]= defmaterial.specr; - GMS.matbuf[0][1][1]= defmaterial.specg; - GMS.matbuf[0][1][2]= defmaterial.specb; + GMS.matbuf[0][1][0]= defmaterial.spec*defmaterial.specr; + GMS.matbuf[0][1][1]= defmaterial.spec*defmaterial.specg; + GMS.matbuf[0][1][2]= defmaterial.spec*defmaterial.specb; GMS.matbuf[0][1][3]= 1.0; /* do material 1 too, for displists! */ |