diff options
author | Matt Ebb <matt@mke3.net> | 2010-07-28 12:05:39 +0400 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2010-07-28 12:05:39 +0400 |
commit | 79dd2cc8e9073039d3518c41d90adb006d344201 (patch) | |
tree | 987c59346ea6fff84f5c9f0bf5b738a2239b3302 /source/blender/editors/space_view3d/drawarmature.c | |
parent | 70bca0405dbb45d34db9c4bdcc407a42832da002 (diff) |
Fix [#22197] empty XYZ text size changing according to distance from origin
Partial revert for commit r 27946
Empty/axis xyz text is now purely aligned to object space. Previous 3d view matrix manipulation
stuff that I added wasn't correct, and causing more problems than it solved. Perhaps someone
can tweak this later to be fixed size/screen aligned, but for now this is less annoying.
Diffstat (limited to 'source/blender/editors/space_view3d/drawarmature.c')
-rw-r--r-- | source/blender/editors/space_view3d/drawarmature.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index d16f89e5785..5e0c49e6224 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -1882,15 +1882,12 @@ static void draw_pose_bones(Scene *scene, View3D *v3d, ARegion *ar, Base *base, /* Draw additional axes on the bone tail */ if ( (arm->flag & ARM_DRAWAXES) && (arm->flag & ARM_POSEMODE) ) { - float mat[4][4]; glPushMatrix(); copy_m4_m4(bmat, pchan->pose_mat); bone_matrix_translate_y(bmat, pchan->bone->length); glMultMatrixf(bmat); - mul_m4_m4m4(mat, bmat, rv3d->viewmatob); - - drawaxes(rv3d, mat, pchan->bone->length*0.25f, 0, OB_ARROWS); + drawaxes(pchan->bone->length*0.25f, 0, OB_ARROWS); glPopMatrix(); } @@ -2078,16 +2075,12 @@ static void draw_ebones(View3D *v3d, ARegion *ar, Object *ob, int dt) } /* Draw additional axes */ if (arm->flag & ARM_DRAWAXES) { - float mat[4][4]; glPushMatrix(); get_matrix_editbone(eBone, bmat); bone_matrix_translate_y(bmat, eBone->length); glMultMatrixf(bmat); - mul_m4_m4m4(mat, bmat, rv3d->viewmatob); - - /* do cached text draw immediate to include transform */ - drawaxes(rv3d, mat, eBone->length*0.25f, 0, OB_ARROWS); + drawaxes(eBone->length*0.25f, 0, OB_ARROWS); glPopMatrix(); } |