bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Bug fix #2320

Browse Source 
Silly 2.36 bug! In FaceSelect mode, other solid objects didn't show. Bad!

Additional; when using Halo material, and setting 'X Alpha', and disabling
Halo option, the 'Only Shadow' option turned on... uses same bit...
No time for real fix here, so for now the bit is always cleared after
disabling Halo.
This commit is contained in:
Ton Roosendaal 2005-03-15 12:30:58 +00:00
parent 9efe92bbaa
commit e9381e61aa
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/src/buttons_shading.c
View File

@ -2483,8 +2483,11 @@ void do_matbuts(unsigned short event)
break;
case B_MATHALO:
/* when halo is disabled, clear star flag, this is the same as MA_FACETEXTURE <blush> */
/* same for 'xtreme alpha' which is 'only shadow' */
ma= G.buts->lockpoin;
if((ma->mode & MA_HALO)==0) ma->mode &= ~MA_STAR;
if((ma->mode & MA_HALO)==0) {
ma->mode &= ~(MA_STAR|MA_HALO_XALPHA);
}
BIF_preview_changed(G.buts);
allqueue(REDRAWBUTSSHADING, 0);
shade_buttons_change_3d();

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

@ -1856,7 +1856,7 @@ static void drawmeshsolid(Object *ob, float *nors)
dl= find_displist(&ob->disp, DL_VERTS);
if(dl) extverts= dl->verts;
glBegin(GL_QUADS);
glmode= GL_QUADS;
@ -4369,7 +4369,7 @@ void draw_object(Base *base)
else if(dt==OB_BOUNDBOX) draw_bounding_volume(ob);
else if(dt==OB_WIRE || me->totface==0) drawmeshwire(ob);
else if(ma && (ma->mode & MA_HALO)) drawmeshwire(ob);
else if(G.f & G_FACESELECT || (G.vd->drawtype==OB_TEXTURE && dt>OB_SOLID)) {
else if( (ob==OBACT && (G.f & G_FACESELECT)) || (G.vd->drawtype==OB_TEXTURE && dt>OB_SOLID)) {
draw_tface_mesh(ob, ob->data, dt);
}
else drawDispList(ob, dt);