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:
authorCampbell Barton <ideasman42@gmail.com>2008-04-13 00:36:35 +0400
committerCampbell Barton <ideasman42@gmail.com>2008-04-13 00:36:35 +0400
commit6b94db570f07429c04a77e321186785aa4b82800 (patch)
tree06674613a619dfd733cae8bca953bb2766ba81b0 /source/blender
parentad6b1e16a591562618b72ef879af5ee95dcad579 (diff)
error in last commit. also use smaller fonts in the sequencer for frame numbers, number string was too long.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/src/drawseq.c6
-rw-r--r--source/blender/src/editmesh_lib.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/src/drawseq.c b/source/blender/src/drawseq.c
index f132e4531e1..e1c80c850df 100644
--- a/source/blender/src/drawseq.c
+++ b/source/blender/src/drawseq.c
@@ -358,7 +358,7 @@ static void draw_seq_handle(Sequence *seq, SpaceSeq *sseq, float pixelx, short d
float x1, x2, y1, y2;
float handsize;
float minhandle, maxhandle;
- char str[120];
+ char str[32];
unsigned int whichsel=0;
View2D *v2d;
@@ -429,9 +429,9 @@ static void draw_seq_handle(Sequence *seq, SpaceSeq *sseq, float pixelx, short d
glRasterPos3f(rx1, y1-0.15, 0.0);
} else {
sprintf(str, "%d", seq->enddisp - 1);
- glRasterPos3f((x2-BMF_GetStringWidth(G.font, str)*pixelx), y2+0.05, 0.0);
+ glRasterPos3f((x2-BMF_GetStringWidth(G.fonts, str)*pixelx), y2+0.05, 0.0);
}
- BMF_DrawString(G.font, str);
+ BMF_DrawString(G.fonts, str);
}
}
diff --git a/source/blender/src/editmesh_lib.c b/source/blender/src/editmesh_lib.c
index 85f2ace2281..009cb6a6ba2 100644
--- a/source/blender/src/editmesh_lib.c
+++ b/source/blender/src/editmesh_lib.c
@@ -1753,7 +1753,7 @@ void adduplicateflag(int flag)
newfa= addfacelist(v1, v2, v3, v4, efa, efa);
- if (act_efa==act_efa) {
+ if (efa==act_efa) {
EM_set_actFace(newfa);
}