forked from bartvdbraak/blender
- fixed error in copying selection from faceselectmode to editmode
- removed ancient convention that switches to wire then
This commit is contained in:
parent
ea84d29d90
commit
766db99e45
@ -4017,7 +4017,7 @@ void draw_object(Base *base)
|
||||
if(ob==((G.scene->basact) ? (G.scene->basact->object) : 0) && (G.f & (G_FACESELECT+G_VERTEXPAINT+G_TEXTUREPAINT+G_WEIGHTPAINT))) {
|
||||
if(ob->type==OB_MESH) {
|
||||
|
||||
if(ob==G.obedit) dt= OB_WIRE;
|
||||
if(ob==G.obedit);
|
||||
else {
|
||||
dt= OB_SHADED;
|
||||
|
||||
|
@ -751,10 +751,12 @@ void make_editMesh()
|
||||
efa->mat_nr= mface->mat_nr;
|
||||
efa->flag= mface->flag & ~ME_HIDE;
|
||||
|
||||
/* select face flag, if no edges we flush down */
|
||||
if(mface->flag & ME_FACE_SEL) {
|
||||
efa->f |= SELECT;
|
||||
if(me->medge==NULL) EM_select_face(efa, 1);
|
||||
if((G.f & G_FACESELECT)==0) {
|
||||
/* select face flag, if no edges we flush down */
|
||||
if(mface->flag & ME_FACE_SEL) {
|
||||
efa->f |= SELECT;
|
||||
if(me->medge==NULL) EM_select_face(efa, 1);
|
||||
}
|
||||
}
|
||||
if(mface->flag & ME_HIDE) efa->h= 1;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user