Revision: 14402
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14402
Author: campbellbarton
Date: 2008-04-12 22:36:35 +0200 (Sat, 12 Apr 2008)
Log Message:
-----------
error in last commit. also use smaller fonts in the sequencer for frame
numbers, number string was too long.
Modified Paths:
--------------
trunk/blender/source/blender/src/drawseq.c
trunk/blender/source/blender/src/editmesh_lib.c
Modified: trunk/blender/source/blender/src/drawseq.c
===================================================================
--- trunk/blender/source/blender/src/drawseq.c 2008-04-12 19:56:53 UTC (rev
14401)
+++ trunk/blender/source/blender/src/drawseq.c 2008-04-12 20:36:35 UTC (rev
14402)
@@ -358,7 +358,7 @@
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 @@
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);
}
}
Modified: trunk/blender/source/blender/src/editmesh_lib.c
===================================================================
--- trunk/blender/source/blender/src/editmesh_lib.c 2008-04-12 19:56:53 UTC
(rev 14401)
+++ trunk/blender/source/blender/src/editmesh_lib.c 2008-04-12 20:36:35 UTC
(rev 14402)
@@ -1753,7 +1753,7 @@
newfa= addfacelist(v1, v2, v3, v4, efa, efa);
- if (act_efa==act_efa) {
+ if (efa==act_efa) {
EM_set_actFace(newfa);
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
