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

bugfix [#23055] transforms with proportional fall off affect hidden vertices in certain situations

Browse Source 
faces were not being checked if they were hidden before adding their internal edges for connected proportional editing.
This commit is contained in:
Campbell Barton
2010-07-28 05:47:46 +00:00
parent 51e8926cb9
commit c32720a0c0
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/transform/transform_conversions.c
View File

@@ -1775,14 +1775,17 @@ static int connectivity_edge(float mtx[][3], EditVert *v1, EditVert *v2)
float edge_len;
int done = 0;
/* note: hidden verts are not being checked for, this assumes
* flushing of hidden faces & edges is working right */
if (v1->f2 + v2->f2 == 4)
return 0;
sub_v3_v3v3(edge_vec, v1->co, v2->co);
mul_m3_v3(mtx, edge_vec);
edge_len = len_v3(edge_vec);
if (v1->f2 + v2->f2 == 4)
return 0;
if (v1->f2) {
if (v2->f2) {
if (v2->tmp.fp + edge_len + THRESHOLD < v1->tmp.fp) {
@@ -1848,7 +1851,7 @@ static void editmesh_set_connectivity_distance(EditMesh *em, float mtx[][3])
/* do internal edges for quads */
for(efa= em->faces.first; efa; efa= efa->next) {
if (efa->v4) {
if (efa->v4 && efa->h==0) {
done |= connectivity_edge(mtx, efa->v1, efa->v3);
done |= connectivity_edge(mtx, efa->v2, efa->v4);
}