Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <mail@jlucke.com>2018-12-29 20:34:25 +0300
committerJacques Lucke <mail@jlucke.com>2018-12-29 20:34:25 +0300
commit07569a333b2e27ccc17cfe6662a9789f74d5fc71 (patch)
treef47766498b7cd5195adfa3f2ed9d94b2470882f0
parent7c438e5366b22eeace2f2e9872e26519c5d5eb01 (diff)
Fix T59675: Motion path frame numbers at wrong positions
Reviewed By: brecht Differential Revision: https://developer.blender.org/D4113
-rw-r--r--source/blender/draw/intern/draw_anim_viz.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/draw/intern/draw_anim_viz.c b/source/blender/draw/intern/draw_anim_viz.c
index 4ec1f761d04..871358f815b 100644
--- a/source/blender/draw/intern/draw_anim_viz.c
+++ b/source/blender/draw/intern/draw_anim_viz.c
@@ -267,15 +267,13 @@ static void MPATH_cache_motion_path(MPATH_PassList *psl,
int frame = sfra + i;
char numstr[32];
size_t numstr_len;
- float co[3];
bool is_keyframe = (mpv->flag & MOTIONPATH_VERT_KEY) != 0;
if ((show_keyframes && show_kf_no && is_keyframe) ||
((avs->path_viewflag & MOTIONPATH_VIEW_FNUMS) && (i == 0)))
{
numstr_len = sprintf(numstr, " %d", frame);
- mul_v3_m4v3(co, ob->imat, mpv->co);
- DRW_text_cache_add(dt, co, numstr, numstr_len, 0, 0, txt_flag, (is_keyframe) ? col_kf : col);
+ DRW_text_cache_add(dt, mpv->co, numstr, numstr_len, 0, 0, txt_flag, (is_keyframe) ? col_kf : col);
}
else if (avs->path_viewflag & MOTIONPATH_VIEW_FNUMS) {
bMotionPathVert *mpvP = (mpv - stepsize);
@@ -283,8 +281,7 @@ static void MPATH_cache_motion_path(MPATH_PassList *psl,
/* only draw framenum if several consecutive highlighted points don't occur on same point */
if ((equals_v3v3(mpv->co, mpvP->co) == 0) || (equals_v3v3(mpv->co, mpvN->co) == 0)) {
numstr_len = sprintf(numstr, " %d", frame);
- mul_v3_m4v3(co, ob->imat, mpv->co);
- DRW_text_cache_add(dt, co, numstr, numstr_len, 0, 0, txt_flag, col);
+ DRW_text_cache_add(dt, mpv->co, numstr, numstr_len, 0, 0, txt_flag, col);
}
}
}