diff options
| author | Ian Thompson <quornian@googlemail.com> | 2008-08-12 14:08:46 +0400 |
|---|---|---|
| committer | Ian Thompson <quornian@googlemail.com> | 2008-08-12 14:08:46 +0400 |
| commit | 0410775e2ed739a580a2a7cc7ff4a7ae374c24b1 (patch) | |
| tree | e2651f004c88b12b10c2624bca39be47c79d676c /source/blender/src/drawtext.c | |
| parent | d90d413421a39e6c5b96fbe483090a13bc9a4569 (diff) | |
| parent | 83bcb9deffb5eef2cbbb883c21f700840175d3fc (diff) | |
Rolled back on rev. 16039. Had problems with display, messages being blank and scripts not being recompiled in some cases. Needs more thought before committing.
Diffstat (limited to 'source/blender/src/drawtext.c')
| -rw-r--r-- | source/blender/src/drawtext.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c index 80233c8295f..8647c3dde58 100644 --- a/source/blender/src/drawtext.c +++ b/source/blender/src/drawtext.c @@ -2036,18 +2036,6 @@ void txt_find_panel(SpaceText *st, int again, int flags) } } -static void txt_print_error(SpaceText *st, char* str) -{ - if (curarea->spacetype != SPACE_TEXT) return; - drawtextspace(curarea, st); - glColor3ub(128, 16, 16); - glRecti(22, curarea->winy-2, curarea->winx-2, curarea->winy-st->lheight-3); - glColor3ub(255, 32, 32); - glRasterPos2i(22, curarea->winy-st->lheight); - BMF_DrawString(spacetext_get_font(st), str); - curarea->win_swap= WIN_BACK_OK; -} - void run_python_script(SpaceText *st) { char *py_filename; @@ -2063,17 +2051,16 @@ void run_python_script(SpaceText *st) if (!st->text) return; if (!strcmp(py_filename, st->text->id.name+2)) { - //error_pyscript( ); + error_pyscript( ); if (lineno >= 0) { txt_move_toline(text, lineno-1, 0); txt_sel_line(text); pop_space_text(st); - } - txt_print_error(st, BPY_Err_getMessage()); + } } else { error("Error in other (possibly external) file, "\ "check console"); - } + } } } @@ -2907,6 +2894,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt) case PKEY: if (G.qual == LR_ALTKEY) { run_python_script(st); + do_draw= 1; } break; /* BREAK P */ case QKEY: |