[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40383] trunk/blender/source/blender/ editors/transform/transform_conversions.c: fix from Juha M?\195? \164ki-Kanto (kanttori), was calculating connectivity data when proportional editmode was enabled, even if connectivity setting was off.

[Campbell Barton]

Revision: 40383
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40383
Author:   campbellbarton
Date:     2011-09-20 06:47:43 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
fix from Juha M?\195?\164ki-Kanto (kanttori), was calculating connectivity data when proportional editmode was enabled, even if connectivity setting was off.

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-20 06:25:15 UTC (rev 40382)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2011-09-20 06:47:43 UTC (rev 40383)
@@ -1983,7 +1983,7 @@
 	float *mappedcos = NULL, *quats= NULL;
 	float mtx[3][3], smtx[3][3], (*defmats)[3][3] = NULL, (*defcos)[3] = NULL;
 	int count=0, countsel=0, a, totleft;
-	int propmode = t->flag & T_PROP_EDIT;
+	int propmode = (t->flag & T_PROP_EDIT) ? (t->flag & (T_PROP_EDIT | T_PROP_CONNECTED)) : 0;
 	int mirror = 0;
 	short selectmode = ts->selectmode;
 
@@ -2053,7 +2053,9 @@
 	copy_m3_m4(mtx, t->obedit->obmat);
 	invert_m3_m3(smtx, mtx);
 
-	if(propmode) editmesh_set_connectivity_distance(em, mtx);
+	if(propmode & T_PROP_CONNECTED) {
+		editmesh_set_connectivity_distance(em, mtx);
+	}
 
 	/* detect CrazySpace [tm] */
 	if(modifiers_getCageIndex(t->scene, t->obedit, NULL, 1)>=0) {