Bugfix #2324
Somehow, not proven how, edges can be selected in a mesh, and not faces or vertices. When entering editmode these selection flags are checked too.
This commit is contained in:
parent
ecf6de151c
commit
7e2e2b2370
@ -1257,7 +1257,7 @@ static void texture_panel_image(Tex *tex)
|
||||
|
||||
uiDefButS(block, TOG|BIT|2, B_IMAPTEST, "MipMap", 10, 160, 60, 18, &tex->imaflag, 0, 0, 0, 0, "Generates a series of pictures to use for mipmapping");
|
||||
uiDefButS(block, TOG|BIT|3, B_IMAPTEST, "Fields", 70, 160, 50, 18, &tex->imaflag, 0, 0, 0, 0, "Click to enable use of fields in Image");
|
||||
uiDefButS(block, TOG|BIT|4, B_TEXPRV, "Rot90", 120, 160, 50, 18, &tex->imaflag, 0, 0, 0, 0, "Rotates image 90 degrees for rendering");
|
||||
uiDefButS(block, TOG|BIT|4, B_TEXPRV, "Rot90", 120, 160, 50, 18, &tex->imaflag, 0, 0, 0, 0, "Actually flips X and Y for rendering, rotates and mirrors");
|
||||
uiDefButS(block, TOG|BIT|7, B_RELOADIMA, "Movie", 170, 160, 50, 18, &tex->imaflag, 0, 0, 0, 0, "Click to enable movie frames as Images");
|
||||
uiDefButS(block, TOG|BIT|8, 0, "Anti", 220, 160, 40, 18, &tex->imaflag, 0, 0, 0, 0, "Toggles Image anti-aliasing");
|
||||
uiDefButS(block, TOG|BIT|10, 0, "StField", 260, 160, 50, 18, &tex->imaflag, 0, 0, 0, 0, "Standard Field Toggle");
|
||||
|
@ -716,6 +716,8 @@ void make_editMesh()
|
||||
if(medge->flag & SELECT) eed->f |= SELECT;
|
||||
if(medge->flag & ME_FGON) eed->h= EM_FGON; // 2 different defines!
|
||||
if(medge->flag & ME_HIDE) eed->h |= 1;
|
||||
|
||||
EM_select_edge(efa, eed->f & SELECT); // force edge selection to vertices, seems to be needed ...
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -414,6 +414,9 @@ void EM_selectmode_set(void)
|
||||
|
||||
if(G.scene->selectmode & SCE_SELECT_VERTEX) {
|
||||
/* vertices -> edges -> faces */
|
||||
for (eed= em->edges.first; eed; eed= eed->next) eed->f &= ~SELECT;
|
||||
for (efa= em->faces.first; efa; efa= efa->next) efa->f &= ~SELECT;
|
||||
|
||||
EM_select_flush();
|
||||
}
|
||||
else if(G.scene->selectmode & SCE_SELECT_EDGE) {
|
||||
|
Loading…
Reference in New Issue
Block a user