Page MenuHome
Files F1307

patch.txt
Public
Actions

patch.txt
View Options

? .DS_Store
? _SConstruct
? config.opts
? scripts
? intern/bmfont/intern/.DS_Store
? make/xc_blender/.DS_Store
? make/xc_blender/build
? make/xc_blender/xc_blender.xcode/randall.pbxuser
? obj/darwin-7.8.0-powerpc
? obj/darwin-8.2.0-powerpc
? source/.DS_Store
? source/blender/.DS_Store
? source/blender/makesdna/intern/dna.c
? tools/__init__.pyc
? tools/scons/__init__.pyc
? tools/scons/bs/__init__.pyc
? tools/scons/bs/bs_arc.pyc
? tools/scons/bs/bs_bincopy.pyc
? tools/scons/bs/bs_clean.pyc
? tools/scons/bs/bs_config.pyc
? tools/scons/bs/bs_default.pyc
? tools/scons/bs/bs_dirs.pyc
? tools/scons/bs/bs_globals.pyc
? tools/scons/bs/bs_libs.pyc
? tools/scons/bs/bs_nsis.pyc
Index: source/blender/src/drawaction.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawaction.c,v
retrieving revision 1.23
diff -u -u -r1.23 drawaction.c
--- source/blender/src/drawaction.c 26 Sep 2005 15:34:20 -0000 1.23
+++ source/blender/src/drawaction.c 5 Oct 2005 02:19:01 -0000
@@ -73,6 +73,7 @@
#include "BIF_screen.h"
#include "BIF_mywindow.h"
#include "BIF_space.h"
+#include "BIF_language.h"
#include "BDR_drawaction.h"
#include "BDR_editcurve.h"
@@ -141,7 +142,8 @@
ACTWIDTH - 2, y + CHANNELHEIGHT + 2);
glColor3ub(0, 0, 0);
glRasterPos2f(4, y + CHANNELHEIGHT + 6);
- BMF_DrawString(G.font, "Sliders");
+ BIF_RasterPos(4, y + CHANNELHEIGHT + 6);
+ BIF_DrawString(G.font, "Sliders", 0);
uiBlockSetEmboss(block, UI_EMBOSSN);
@@ -239,7 +241,8 @@
else
BIF_ThemeColor(TH_TEXT);
glRasterPos2f(x+8, y-4);
- BMF_DrawString(G.font, chan->name);
+ BIF_RasterPos(x+8, y-4);
+ BIF_DrawString(G.font, chan->name, 0);
y-=CHANNELHEIGHT+CHANNELSKIP;
/* Draw constraint channels */
@@ -251,7 +254,8 @@
BIF_ThemeColor(TH_TEXT);
glRasterPos2f(x+32, y-4);
- BMF_DrawString(G.font, conchan->name);
+ BIF_RasterPos(x+32, y-4);
+ BIF_DrawString(G.font, conchan->name, 0);
y-=CHANNELHEIGHT+CHANNELSKIP;
}
}
@@ -280,6 +284,7 @@
glColor3ub(0, 0, 0);
glRasterPos2f(x+8, y-4);
+ BIF_RasterPos(x+8, y-4);
kb = kb->next;
/* Blender now has support for named
* key blocks. If a name hasn't
@@ -290,10 +295,10 @@
*/
if (kb->name[0] == '\0') {
sprintf(keyname, "Key %d", i);
- BMF_DrawString(G.font, keyname);
+ BIF_DrawString(G.font, keyname, 0);
}
else {
- BMF_DrawString(G.font, kb->name);
+ BIF_DrawString(G.font, kb->name, 0);
}
y-=CHANNELHEIGHT+CHANNELSKIP;
Index: source/blender/src/drawimasel.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawimasel.c,v
retrieving revision 1.19
diff -u -u -r1.19 drawimasel.c
--- source/blender/src/drawimasel.c 4 Aug 2005 22:36:21 -0000 1.19
+++ source/blender/src/drawimasel.c 5 Oct 2005 02:19:01 -0000
@@ -63,6 +63,7 @@
#include "BIF_mywindow.h"
#include "BIF_space.h"
#include "BIF_resources.h"
+#include "BIF_language.h"
#include "BSE_drawimasel.h"
#include "BSE_filesel.h"
@@ -494,7 +495,8 @@
}
glRasterPos2i(sx, sy);
- BMF_DrawString(G.font, naam);
+ BIF_RasterPos(sx, sy);
+ BIF_DrawString(G.font, naam, 0);
direntry = direntry->next;
sy-=IMALINESIZE;
@@ -600,7 +602,8 @@
naam[11] = 0;
glRasterPos2i(sx+32-BMF_GetStringWidth(G.fonts, naam) / 2 , sy-16);
- BMF_DrawString(G.fonts, naam);
+ BIF_RasterPos(sx+32-BMF_GetStringWidth(G.fonts, naam) / 2 , sy-16);
+ BIF_DrawString(G.fonts, naam, 0);
if ((ima) && (ima->pict) && (ima->pict->rect)){
if ( (ey > simasel->fesy) && (sy < simasel->feey)){
@@ -661,7 +664,8 @@
cpack(0xAAAAAA);
glRasterPos2i(simasel->infsx+4, simasel->infsy+6);
- BMF_DrawString(G.font, infostr);
+ BIF_RasterPos(simasel->infsx+4, simasel->infsy+6);
+ BIF_DrawString(G.font, infostr, 0);
areaview(); /* reset viewgate */
Index: source/blender/src/drawipo.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawipo.c,v
retrieving revision 1.60
diff -u -u -r1.60 drawipo.c
--- source/blender/src/drawipo.c 3 Oct 2005 14:13:47 -0000 1.60
+++ source/blender/src/drawipo.c 5 Oct 2005 02:19:02 -0000
@@ -74,6 +74,7 @@
#include "BIF_mywindow.h"
#include "BIF_space.h"
#include "BIF_glutil.h"
+#include "BIF_language.h"
#include "BSE_drawipo.h"
#include "BSE_view.h"
@@ -125,8 +126,8 @@
str[len+1]= 0;
}
- glRasterPos2f(x, y);
- BMF_DrawString(G.fonts, str);
+ BIF_RasterPos(x, y);
+ BIF_DrawString(G.fonts, str, 0);
}
static void step_to_grid(float *step, int *macht)
Index: source/blender/src/drawnla.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawnla.c,v
retrieving revision 1.21
diff -u -u -r1.21 drawnla.c
--- source/blender/src/drawnla.c 4 Aug 2005 22:36:21 -0000 1.21
+++ source/blender/src/drawnla.c 5 Oct 2005 02:19:02 -0000
@@ -70,6 +70,7 @@
#include "BIF_space.h"
#include "BIF_interface.h"
#include "BIF_glutil.h"
+#include "BIF_language.h"
#include "BDR_drawaction.h"
#include "BDR_editcurve.h"
@@ -128,8 +129,9 @@
else
BIF_ThemeColor(TH_TEXT);
glRasterPos2f(x+16, y-4);
+ BIF_RasterPos(x+16, y-4);
- BMF_DrawString(G.font, base->object->id.name+2);
+ BIF_DrawString(G.font, base->object->id.name+2, 0);
/* Draw the constraint ipos */
for (conchan = base->object->constraintChannels.first; conchan; conchan=conchan->next){
@@ -143,7 +145,8 @@
BIF_ThemeColor(TH_TEXT);
glRasterPos2f(x+32, y-4);
- BMF_DrawString(G.font, conchan->name);
+ BIF_RasterPos(x+32, y-4);
+ BIF_DrawString(G.font, conchan->name, 0);
}
/* Draw the action timeline */
@@ -159,8 +162,8 @@
BIF_ThemeColor(TH_TEXT_HI);
else
BIF_ThemeColor(TH_TEXT);
- glRasterPos2f(x+32, y-4);
- BMF_DrawString(G.font, base->object->action->id.name+2);
+ BIF_RasterPos(x+32, y-4);
+ BIF_DrawString(G.font, base->object->action->id.name+2, 0);
}
}
y-=NLACHANNELHEIGHT+NLACHANNELSKIP;
@@ -178,8 +181,8 @@
// why this test? check freeing mem when deleting strips? (ton)
if(strip->act) {
- glRasterPos2f(x+48, y-4);
- BMF_DrawString(G.font, strip->act->id.name+2);
+ BIF_RasterPos(x+48, y-4);
+ BIF_DrawString(G.font, strip->act->id.name+2, 0);
y-=(NLACHANNELHEIGHT+NLACHANNELSKIP);
}
Index: source/blender/src/drawtime.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawtime.c,v
retrieving revision 1.10
diff -u -u -r1.10 drawtime.c
--- source/blender/src/drawtime.c 20 Sep 2005 17:28:23 -0000 1.10
+++ source/blender/src/drawtime.c 5 Oct 2005 02:19:03 -0000
@@ -59,6 +59,7 @@
#include "BIF_mywindow.h"
#include "BIF_screen.h"
#include "BIF_resources.h"
+#include "BIF_language.h"
#include "BSE_drawipo.h"
#include "BSE_view.h"
@@ -114,8 +115,8 @@
glColor4ub(0, 0, 0, 0);
BIF_ThemeColor(TH_TEXT);
- glRasterPos2f(x, y);
- BMF_DrawString(G.fonts, str);
+ BIF_RasterPos(x, y);
+ BIF_DrawString(G.fonts, str, 0);
}
Index: source/blender/src/drawview.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawview.c,v
retrieving revision 1.163
diff -u -u -r1.163 drawview.c
--- source/blender/src/drawview.c 29 Sep 2005 21:31:47 -0000 1.163
+++ source/blender/src/drawview.c 5 Oct 2005 02:19:04 -0000
@@ -106,6 +106,7 @@
#include "BIF_resources.h"
#include "BIF_screen.h"
#include "BIF_space.h"
+#include "BIF_language.h"
#include "BDR_drawmesh.h"
#include "BDR_drawobject.h"
@@ -1088,8 +1089,8 @@
else sprintf(info, "(%d) %s", CFRA, ob->id.name+2);
BIF_ThemeColor(TH_TEXT_HI);
- glRasterPos2i(30, 10);
- BMF_DrawString(G.fonts, info);
+ BIF_RasterPos(30, 10);
+ BIF_DrawString(G.fonts, info, 0);
}
Index: source/blender/src/edit.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/edit.c,v
retrieving revision 1.78
diff -u -u -r1.78 edit.c
--- source/blender/src/edit.c 3 Oct 2005 09:04:57 -0000 1.78
+++ source/blender/src/edit.c 5 Oct 2005 02:19:05 -0000
@@ -92,6 +92,7 @@
#include "BIF_space.h"
#include "BIF_screen.h"
#include "BIF_toolbox.h"
+#include "BIF_language.h"
#include "BSE_edit.h"
#include "BSE_drawipo.h"
@@ -237,10 +238,12 @@
sprintf(str, "X %.4f Y %.4f Z %.4f Dia %.4f", dvec[0], dvec[1], dvec[2], sqrt(dvec[0]*dvec[0]+dvec[1]*dvec[1]+dvec[2]*dvec[2]));
glColor3f(0.0, 0.0, 0.0);
glRasterPos2i(15, 27);
- BMF_DrawString(G.fonts, str);
+ BIF_RasterPos(15, 27);
+ BIF_DrawString(G.fonts, str, 0);
glColor3f(0.7, 0.7, 0.7);
glRasterPos2i(16, 28);
- BMF_DrawString(G.fonts, str);
+ BIF_RasterPos(16, 28);
+ BIF_DrawString(G.fonts, str, 0);
}
else if(G.vd->persp==2) {
rcti vb;
@@ -256,10 +259,12 @@
sprintf(str, "X %.1f Y %.1f Dia %.1f", fabs(fac1), fabs(fac2), sqrt(fac1*fac1 + fac2*fac2) );
glColor3f(0.0, 0.0, 0.0);
glRasterPos2i(15, 27);
- BMF_DrawString(G.fonts, str);
+ BIF_RasterPos(15, 27);
+ BIF_DrawString(G.fonts, str, 0);
glColor3f(0.7, 0.7, 0.7);
glRasterPos2i(16, 28);
- BMF_DrawString(G.fonts, str);
+ BIF_RasterPos(16, 28);
+ BIF_DrawString(G.fonts, str, 0);
}
}
else if(curarea->spacetype==SPACE_IPO) {
@@ -275,11 +280,13 @@
sprintf(str, "Time: %.4f Y %.4f", dvec[0]-dvec[2], dvec[1]-dvec[3]);
glRasterPos2i(30, 30);
+ BIF_RasterPos(30, 30);
glColor3f(0.0, 0.0, 0.0);
- BMF_DrawString(G.fonts, str);
+ BIF_DrawString(G.fonts, str, 0);
glRasterPos2i(31, 31);
+ BIF_RasterPos(31, 31);
glColor3f(0.9, 0.9, 0.9);
- BMF_DrawString(G.fonts, str);
+ BIF_DrawString(G.fonts, str, 0);
}
glFlush();
Index: source/blender/src/editscreen.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/editscreen.c,v
retrieving revision 1.113
diff -u -u -r1.113 editscreen.c
--- source/blender/src/editscreen.c 3 Oct 2005 09:04:57 -0000 1.113
+++ source/blender/src/editscreen.c 5 Oct 2005 02:19:06 -0000
@@ -88,6 +88,7 @@
#include "BIF_usiblender.h"
#include "BIF_keyval.h"
#include "BIF_resources.h"
+#include "BIF_language.h"
#include "BSE_edit.h"
#include "BSE_filesel.h"
@@ -233,7 +234,8 @@
BIF_ThemeColor(TH_MENU_TEXT); /* better than cpack(0x0) color no? (desoto) */
glRasterPos2i(20+curarea->headbutofs, 6);
- BMF_DrawString(G.font, str);
+ BIF_RasterPos(20+curarea->headbutofs, 6);
+ BIF_DrawString(G.font, str, 0);
curarea->head_swap= WIN_BACK_OK;
areawinset(curarea->win);
@@ -688,7 +690,8 @@
glColor3ub(0, 0, 0);
glRasterPos2i((prefsizx-width)/2, (prefsizy-bbuf->y)/2 + 6);
- BMF_DrawString(font, string);
+ BIF_RasterPos((prefsizx-width)/2, (prefsizy-bbuf->y)/2 + 6);
+ BIF_DrawString(font, string, 0);
}
glFlush();
@@ -3617,7 +3620,8 @@
cpack(0x0);
glRasterPos2i(x, y);
- BMF_DrawString(G.fonts, text);
+ BIF_RasterPos(x, y);
+ BIF_DrawString(G.fonts, text, 0);
glFlush();
glDrawBuffer(GL_BACK);
Index: source/blender/src/filesel.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/filesel.c,v
retrieving revision 1.62
diff -u -u -r1.62 filesel.c
--- source/blender/src/filesel.c 26 Sep 2005 16:17:14 -0000 1.62
+++ source/blender/src/filesel.c 5 Oct 2005 02:19:07 -0000
@@ -91,6 +91,7 @@
#include "BIF_space.h"
#include "BIF_screen.h"
#include "BIF_resources.h"
+#include "BIF_language.h"
#include "BLO_readfile.h"
@@ -987,46 +988,46 @@
s = files->string;
if(s) {
- glRasterPos2i(x, y);
- BMF_DrawString(G.font, files->relname);
+ BIF_RasterPos(x, y);
+ BIF_DrawString(G.font, files->relname, 0);
x += sfile->maxnamelen + 100;
- glRasterPos2i(x - BMF_GetStringWidth(G.font, files->size), y);
- BMF_DrawString(G.font, files->size);
+ BIF_RasterPos(x - BMF_GetStringWidth(G.font, files->size), y);
+ BIF_DrawString(G.font, files->size, 0);
if(sfile->flag & FILE_SHOWSHORT) return;
#ifndef WIN32
/* rwx rwx rwx */
- x += 20; glRasterPos2i(x, y);
- BMF_DrawString(G.font, files->mode1);
+ x += 20; BIF_RasterPos(x, y);
+ BIF_DrawString(G.font, files->mode1, 0);
- x += 30; glRasterPos2i(x, y);
- BMF_DrawString(G.font, files->mode2);
+ x += 30; BIF_RasterPos(x, y);
+ BIF_DrawString(G.font, files->mode2, 0);
- x += 30; glRasterPos2i(x, y);
- BMF_DrawString(G.font, files->mode3);
+ x += 30; BIF_RasterPos(x, y);
+ BIF_DrawString(G.font, files->mode3, 0);
/* owner time date */
- x += 30; glRasterPos2i(x, y);
- BMF_DrawString(G.font, files->owner);
+ x += 30; BIF_RasterPos(x, y);
+ BIF_DrawString(G.font, files->owner, 0);
#endif
- x += 60; glRasterPos2i(x, y);
- BMF_DrawString(G.font, files->time);
+ x += 60; BIF_RasterPos(x, y);
+ BIF_DrawString(G.font, files->time, 0);
- x += 50; glRasterPos2i(x, y);
- BMF_DrawString(G.font, files->date);
+ x += 50; BIF_RasterPos(x, y);
+ BIF_DrawString(G.font, files->date, 0);
}
else {
- glRasterPos2i(x, y);
- BMF_DrawString(G.font, files->relname);
+ BIF_RasterPos(x, y);
+ BIF_DrawString(G.font, files->relname, 0);
if(files->nr) { /* extra info */
x+= sfile->maxnamelen+20;
- glRasterPos2i(x, y);
- BMF_DrawString(G.font, files->extra);
+ BIF_RasterPos(x, y);
+ BIF_DrawString(G.font, files->extra, 0);
}
}
}
Index: source/blender/src/header_imasel.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/header_imasel.c,v
retrieving revision 1.9
diff -u -u -r1.9 header_imasel.c
--- source/blender/src/header_imasel.c 23 Mar 2005 21:10:02 -0000 1.9
+++ source/blender/src/header_imasel.c 5 Oct 2005 02:19:07 -0000
@@ -121,7 +121,8 @@
if (simasel->title){
xco+=25;
glRasterPos2i(xco, 4);
- BMF_DrawString(G.font, simasel->title);
+ BIF_RasterPos(xco, 4);
+ BIF_DrawString(G.font, simasel->title, 0);
xco+=BMF_GetStringWidth(G.fonts, simasel->title);
xco+=25;
}
Index: source/blender/src/header_oops.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/header_oops.c,v
retrieving revision 1.22
diff -u -u -r1.22 header_oops.c
--- source/blender/src/header_oops.c 4 Aug 2005 22:36:21 -0000 1.22
+++ source/blender/src/header_oops.c 5 Oct 2005 02:19:08 -0000
@@ -62,6 +62,7 @@
#include "BIF_oops.h"
#include "BIF_outliner.h"
#include "BIF_space.h"
+#include "BIF_language.h"
#include "BSE_drawipo.h"
#include "BSE_drawoops.h"
@@ -408,7 +409,8 @@
cpack(0x0);
glRasterPos2i(xco+=XIC+10, 5);
- BMF_DrawString(uiBlockGetCurFont(block), naam);
+ BIF_RasterPos(xco+=XIC+10, 5);
+ BIF_DrawString(uiBlockGetCurFont(block), naam, 0);
}
}
Index: source/blender/src/header_sound.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/header_sound.c,v
retrieving revision 1.18
diff -u -u -r1.18 header_sound.c
--- source/blender/src/header_sound.c 4 Aug 2005 22:36:21 -0000 1.18
+++ source/blender/src/header_sound.c 5 Oct 2005 02:19:08 -0000
@@ -63,6 +63,7 @@
#include "BIF_space.h"
#include "BIF_toolbox.h"
#include "BIF_butspace.h"
+#include "BIF_language.h"
#include "BKE_global.h"
#include "BKE_main.h"
@@ -297,14 +298,16 @@
sprintf(naam, "Sample: %s, %d bit, %d Hz, %d samples", ch, sound->sample->bits, sound->sample->rate, sound->sample->len);
cpack(0x0);
glRasterPos2i(xco+10, 5);
- BMF_DrawString(uiBlockGetCurFont(block), naam);
+ BIF_RasterPos(xco+10, 5);
+ BIF_DrawString(uiBlockGetCurFont(block), naam, 0);
}
else
{
sprintf(naam, "No sample info available.");
cpack(0x0);
glRasterPos2i(xco+10, 5);
- BMF_DrawString(uiBlockGetCurFont(block), naam);
+ BIF_RasterPos(xco+10, 5);
+ BIF_DrawString(uiBlockGetCurFont(block), naam, 0);
}
}
Index: source/blender/src/renderwin.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/renderwin.c,v
retrieving revision 1.59
diff -u -u -r1.59 renderwin.c
--- source/blender/src/renderwin.c 3 Oct 2005 10:10:19 -0000 1.59
+++ source/blender/src/renderwin.c 5 Oct 2005 02:19:08 -0000
@@ -79,6 +79,7 @@
#include "BIF_renderwin.h"
#include "BIF_resources.h"
#include "BIF_toets.h"
+#include "BIF_language.h"
#include "BDR_editobject.h"
#include "BPY_extern.h" /* for BPY_do_all_scripts */
@@ -285,7 +286,8 @@
if(rw->render_text) {
BIF_ThemeColor(TH_TEXT);
glRasterPos2i(12, 5);
- BMF_DrawString(G.fonts, rw->render_text);
+ BIF_RasterPos(12, 5);
+ BIF_DrawString(G.fonts, rw->render_text, 0);
}
BIF_SetTheme(curarea); // restore theme
@@ -354,7 +356,8 @@
glDisable(GL_BLEND);
glColor3ub(255, 255, 255);
glRasterPos2i(10, 10);
- BMF_DrawString(G.font, rw->info_text);
+ BIF_RasterPos(10, 10);
+ BIF_DrawString(G.font, rw->info_text, 0);
}
window_swap_buffers(rw->win);
@@ -859,8 +862,8 @@
if(str) {
BIF_ThemeColor(TH_TEXT);
- glRasterPos2i(vb.xmin+12, vb.ymax+5);
- BMF_DrawString(G.fonts, str);
+ BIF_RasterPos(vb.xmin+12, vb.ymax+5);
+ BIF_DrawString(G.fonts, str, 0);
}
glFlush();
Index: source/blender/src/swapbuffers.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/swapbuffers.c,v
retrieving revision 1.14
diff -u -u -r1.14 swapbuffers.c
--- source/blender/src/swapbuffers.c 17 Apr 2005 18:00:33 -0000 1.14
+++ source/blender/src/swapbuffers.c 5 Oct 2005 02:19:09 -0000
@@ -56,6 +56,7 @@
#include "BIF_mywindow.h"
#include "BIF_screen.h"
#include "BIF_space.h"
+#include "BIF_language.h"
#include "winlay.h"
@@ -163,10 +164,10 @@
glRecti(2, 2, w-4, h-4);
glColor3ub(0, 0, 0);
- glRasterPos2i(5, 5);
+ BIF_RasterPos(5, 5);
sprintf(buf, "win: %d - (%d, %d, %d, %d) %d\n", win, x, y, w, h, drawcounter++);
- BMF_DrawString(G.font, buf);
+ BIF_DrawString(G.font, buf, 0);
}
static void screen_swapbuffers_DEBUG(bScreen *sc)

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
81/c6/b71547b0e99ee9a11b1f9a31d983

Event Timeline