[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30824] trunk/blender/source/blender/ editors/transform/transform_conversions.c: bugfix [#23055] transforms with proportional fall off affect hidden vertices in certain situations

[Campbell Barton]

Revision: 30824
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30824
Author:   campbellbarton
Date:     2010-07-28 07:47:46 +0200 (Wed, 28 Jul 2010)

Log Message:
-----------
bugfix [#23055] transforms with proportional fall off affect hidden vertices in certain situations
faces were not being checked if they were hidden before adding their internal edges for connected proportional editing.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform_conversions.c

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c	2010-07-28 05:41:32 UTC (rev 30823)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2010-07-28 05:47:46 UTC (rev 30824)
@@ -1775,14 +1775,17 @@
 	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 @@
 
 		/* 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);
 			}