diff options
| author | Ton Roosendaal <ton@blender.org> | 2007-01-12 14:13:34 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2007-01-12 14:13:34 +0300 |
| commit | 765e464a71a339e15454ca35621c8f4923b64869 (patch) | |
| tree | a1381301d062d14ccc0508353012560d34a453ae /source/blender/src/editfont.c | |
| parent | e9291b78e2346c319c9bc1e31ae41e6b69859380 (diff) | |
Bugfixes:
- the "number/string button widget", or sbutton(), button() and fbutton()
calls, were using button event '1' or '2' to denote events, whilst this
could also be an other defined event.
Bug showed as unwanted display changes in ipo window after using marker
renaming for example.
- slider buttons for Action Window were expecting ints, while using short.
- cleanup in blender/src for warnings
Diffstat (limited to 'source/blender/src/editfont.c')
| -rw-r--r-- | source/blender/src/editfont.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/src/editfont.c b/source/blender/src/editfont.c index 9447ef59bbb..a3de5d03283 100644 --- a/source/blender/src/editfont.c +++ b/source/blender/src/editfont.c @@ -945,7 +945,7 @@ void do_textedit(unsigned short event, short val, unsigned long _ascii) void paste_unicodeText(char *filename) { - Curve *cu; + Curve *cu= G.obedit->data; int filelen, doit= 0; char *strp; FILE *fp = NULL; @@ -953,7 +953,6 @@ void paste_unicodeText(char *filename) fp= fopen(filename, "r"); if(fp) { - cu= G.obedit->data; fseek( fp, 0L, SEEK_END ); filelen = ftell( fp ); @@ -993,7 +992,7 @@ void paste_unicodeText(char *filename) void paste_editText(void) { - Curve *cu; + Curve *cu= G.obedit->data; int filelen, doit= 0; char *strp; FILE *fp = NULL; @@ -1020,7 +1019,6 @@ void paste_editText(void) #endif if(fp) { - cu= G.obedit->data; fseek(fp, 0L, SEEK_END); filelen = ftell( fp ); |