archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

* Visualise material 'Shadeless' a bit better in the 3D View solid mode.

Browse Source 
Now it draws as if Ref = Emit = 1.0 - not as accurate as shaded mode,
  but it's better than before, and at least it allows transparency.
This commit is contained in:
Matt Ebb
2007-03-09 04:19:59 +00:00
parent b8e236a861
commit 86a20402b6
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/blender/src/drawobject.c
View File

@@ -199,11 +199,18 @@ int init_gl_materials(Object *ob, int check_alpha)
ma= give_current_material(ob, a);
ma= editnode_get_active_material(ma);
if(ma==NULL) ma= &defmaterial;
if(a<MAXMATBUF) {
matbuf[a][0][0]= (ma->ref+ma->emit)*ma->r;
matbuf[a][0][1]= (ma->ref+ma->emit)*ma->g;
matbuf[a][0][2]= (ma->ref+ma->emit)*ma->b;
if (ma->mode & MA_SHLESS) {
matbuf[a][0][0]= 2*ma->r;
matbuf[a][0][1]= 2*ma->g;
matbuf[a][0][2]= 2*ma->b;
} else {
matbuf[a][0][0]= (ma->ref+ma->emit)*ma->r;
matbuf[a][0][1]= (ma->ref+ma->emit)*ma->g;
matbuf[a][0][2]= (ma->ref+ma->emit)*ma->b;
}
/* draw transparent, not in pick-select, nor editmode */
if(check_alpha && !(G.f & G_PICKSEL) && (ob->dtx & OB_DRAWTRANSP) && !(G.obedit && G.obedit->data==ob->data)) {
if(G.vd->transp) { // drawing the transparent pass
@@ -221,10 +228,12 @@ int init_gl_materials(Object *ob, int check_alpha)
else
matbuf[a][0][3]= 1.0;
matbuf[a][1][0]= ma->spec*ma->specr;
matbuf[a][1][1]= ma->spec*ma->specg;
matbuf[a][1][2]= ma->spec*ma->specb;
matbuf[a][1][3]= 1.0;
if (!(ma->mode & MA_SHLESS)) {
matbuf[a][1][0]= ma->spec*ma->specr;
matbuf[a][1][1]= ma->spec*ma->specg;
matbuf[a][1][2]= ma->spec*ma->specb;
matbuf[a][1][3]= 1.0;
}
}
}