[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40461] trunk/blender/source/blender/ editors/transform/transform_conversions.c: Fix rest of #28693: Proportional edit hangs on mesh object with high scale

[Sergey Sharybin]

Revision: 40461
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40461
Author:   nazgul
Date:     2011-09-22 15:46:34 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
Fix rest of #28693: Proportional edit hangs on mesh object with high scale

Patchy by Juha Maki-Kanto

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	2011-09-22 15:44:35 UTC (rev 40460)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2011-09-22 15:46:34 UTC (rev 40461)
@@ -1807,7 +1807,7 @@
 /* ********************* mesh ****************** */
 
 /* proportional distance based on connectivity  */
-#define THRESHOLD	0.0001f
+#define THRESHOLDFACTOR (1.0f-0.0001f)
 
 static int connectivity_edge(float mtx[][3], EditVert *v1, EditVert *v2)
 {
@@ -1828,10 +1828,10 @@
 
 	if (v1->f2) {
 		if (v2->f2) {
-			if (v2->tmp.fp + edge_len + THRESHOLD < v1->tmp.fp) {
+			if (v2->tmp.fp + edge_len < THRESHOLDFACTOR * v1->tmp.fp) {
 				v1->tmp.fp = v2->tmp.fp + edge_len;
 				done = 1;
-			} else if (v1->tmp.fp + edge_len + THRESHOLD < v2->tmp.fp) {
+			} else if (v1->tmp.fp + edge_len < THRESHOLDFACTOR * v2->tmp.fp) {
 				v2->tmp.fp = v1->tmp.fp + edge_len;
 				done = 1;
 			}