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

- fix: vpaint and weightpaint and texturepaint allow drawmode wire-extra

Browse Source 
again.
This commit is contained in:
Ton Roosendaal
2003-11-17 21:10:18 +00:00
parent 3e938a9223
commit 0894c8e3e2
2 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3505,7 +3505,7 @@ void draw_object(Base *base)
}
}
}
else if(dt>=OB_WIRE ) {
if(dt>=OB_WIRE ) {
if(dt>OB_SOLID) if(G.f & G_BACKBUFSEL) dt= OB_SOLID;
@@ -3514,11 +3514,14 @@ void draw_object(Base *base)
// the only 2 extra drawtypes alowed in editmode
dtx= dtx & (OB_DRAWWIRE|OB_TEXSPACE);
}
else if(G.f & (G_FACESELECT)) {
// unwanted combo
dtx &= ~OB_DRAWWIRE;
}
if(G.f & G_DRAW_EXT) {
if(ob->type==OB_EMPTY || ob->type==OB_CAMERA || ob->type==OB_LAMP) dt= OB_WIRE;
}
}
if( (G.f & G_DRAW_EXT) && dt>OB_WIRE) {