Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix from Juha Mäki-Kanto (kanttori), was calculating connectivity data when proportional editmode was enabled, even if connectivity setting was off.

Browse Source
This commit is contained in:
Campbell Barton
2011-09-20 06:47:43 +00:00
parent 13dfd82997
commit d321397930
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1983,7 +1983,7 @@ static void createTransEditVerts(bContext *C, TransInfo *t)
float *mappedcos = NULL, *quats= NULL; float *mappedcos = NULL, *quats= NULL;
float mtx[3][3], smtx[3][3], (*defmats)[3][3] = NULL, (*defcos)[3] = NULL; float mtx[3][3], smtx[3][3], (*defmats)[3][3] = NULL, (*defcos)[3] = NULL;
int count=0, countsel=0, a, totleft; 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; int mirror = 0;
short selectmode = ts->selectmode; short selectmode = ts->selectmode;
@@ -2053,7 +2053,9 @@ static void createTransEditVerts(bContext *C, TransInfo *t)
copy_m3_m4(mtx, t->obedit->obmat); copy_m3_m4(mtx, t->obedit->obmat);
invert_m3_m3(smtx, mtx); 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] */ /* detect CrazySpace [tm] */
if(modifiers_getCageIndex(t->scene, t->obedit, NULL, 1)>=0) { if(modifiers_getCageIndex(t->scene, t->obedit, NULL, 1)>=0) {