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

code cleanup

Browse Source
This commit is contained in:
Campbell Barton
2012-12-18 05:38:21 +00:00
parent dd68223c72
commit 40a667e2ff
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/transform/transform_manipulator.c
View File

@@ -552,8 +552,9 @@ int calc_manipulator_stats(const bContext *C)
switch (v3d->twmode) {
case V3D_MANIP_GLOBAL:
{
break; /* nothing to do */
}
case V3D_MANIP_GIMBAL:
{
float mat[3][3];
@@ -562,16 +563,21 @@ int calc_manipulator_stats(const bContext *C)
break;
}
/* if not gimbal, fall through to normal */
/* pass through */
}
case V3D_MANIP_NORMAL:
{
if (obedit || ob->mode & OB_MODE_POSE) {
float mat[3][3];
ED_getTransformOrientationMatrix(C, mat, (v3d->around == V3D_ACTIVE));
copy_m4_m3(rv3d->twmat, mat);
break;
}
/* no break we define 'normal' as 'local' in Object mode */
/* no break we define 'normal' as 'local' in Object mode */
/* pass through */
}
case V3D_MANIP_LOCAL:
{
if (ob->mode & OB_MODE_POSE) {
/* each bone moves on its own local axis, but to avoid confusion,
* use the active pones axis for display [#33575], this works as expected on a single bone
@@ -585,15 +591,15 @@ int calc_manipulator_stats(const bContext *C)
copy_m4_m4(rv3d->twmat, ob->obmat);
normalize_m4(rv3d->twmat);
break;
}
case V3D_MANIP_VIEW:
{
float mat[3][3];
copy_m3_m4(mat, rv3d->viewinv);
normalize_m3(mat);
copy_m4_m3(rv3d->twmat, mat);
break;
}
break;
default: /* V3D_MANIP_CUSTOM */
{
float mat[3][3];

4
source/blender/editors/transform/transform_orientations.c
View File

@@ -738,7 +738,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
}
}
if (normal[0] != 0 || normal[1] != 0 || normal[2] != 0) {
if (!is_zero_v3(normal)) {
result = ORIENTATION_NORMAL;
}
}
@@ -780,7 +780,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
normalize_v3(normal);
normalize_v3(plane);
if (plane[0] != 0 || plane[1] != 0 || plane[2] != 0) {
if (!is_zero_v3(plane)) {
result = ORIENTATION_EDGE;
}