griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

bugfix [#24509] UV/Image Editor: selected elements move not as specified

Browse Source
This commit is contained in:
Campbell Barton
2010-11-16 17:37:26 +00:00
parent fe2df7849e
commit b1b02b7a5e
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/editors/space_image/space_image.c
View File

@@ -225,9 +225,18 @@ void ED_space_image_uv_aspect(SpaceImage *sima, float *aspx, float *aspy)
ED_space_image_aspect(sima, aspx, aspy);
ED_space_image_size(sima, &w, &h);
*aspx *= (float)w;
*aspy *= (float)h;
*aspx *= (float)w/256.0f;
*aspy *= (float)h/256.0f;
if(*aspx < *aspy) {
*aspy= *aspy / *aspx;
*aspx= 1.0f;
}
else {
*aspx= *aspx / *aspy;
*aspy= 1.0f;
}
}
void ED_image_uv_aspect(Image *ima, float *aspx, float *aspy)

7
source/blender/editors/transform/transform.c
View File

@@ -3426,6 +3426,9 @@ int Translation(TransInfo *t, short UNUSED(mval[2]))
if (t->con.mode & CON_APPLY) {
float pvec[3] = {0.0f, 0.0f, 0.0f};
float tvec[3];
if (hasNumInput(&t->num)) {
removeAspectRatio(t, t->values);
}
applySnapping(t, t->values);
t->con.applyVec(t, NULL, t->values, tvec, pvec);
VECCOPY(t->values, tvec);
@@ -3435,11 +3438,9 @@ int Translation(TransInfo *t, short UNUSED(mval[2]))
applyNDofInput(&t->ndof, t->values);
snapGrid(t, t->values);
applyNumInput(&t->num, t->values);
if (hasNumInput(&t->num))
{
if (hasNumInput(&t->num)) {
removeAspectRatio(t, t->values);
}
applySnapping(t, t->values);
headerTranslation(t, t->values, str);
}

1
source/blender/editors/transform/transform_constraints.c
View File

@@ -154,6 +154,7 @@ static void postConstraintChecks(TransInfo *t, float vec[3], float pvec[3]) {
if (hasNumInput(&t->num)) {
applyNumInput(&t->num, vec);
removeAspectRatio(t, vec);
constraintNumInput(t, vec);
}