diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-10-31 17:51:35 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-10-31 17:51:35 +0300 |
| commit | 12843fc152111a932d785229eebf0623be06d925 (patch) | |
| tree | dfa4155f926af7814b5410f54e05ecc474b49b8d /source/blender/src/toolbox.c | |
| parent | 6c04fe887e753e73d08db4d2f1497eb03967afc0 (diff) | |
Fix for #1715
Old & annoying; error() menu doesnt work while rendering, and is still
called for many occsasions. Error also caused Blender window to screw up.
Now error() just prints during render.
Diffstat (limited to 'source/blender/src/toolbox.c')
| -rw-r--r-- | source/blender/src/toolbox.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c index 04a8c37a7f2..a36806eae6d 100644 --- a/source/blender/src/toolbox.c +++ b/source/blender/src/toolbox.c @@ -109,6 +109,7 @@ #include "mydevice.h" #include "blendef.h" +#include "render.h" static int tbx1, tbx2, tby1, tby2, tbfontyofs, tbmain=0; static int tbmemx=TBOXX/2, tbmemy=(TBOXEL-0.5)*TBOXH, tboldwin, addmode= 0; @@ -1087,7 +1088,7 @@ void error(char *fmt, ...) sprintf(nfmt, "ERROR: %s", fmt); va_start(ap, fmt); - if (G.background || !G.curscreen) { + if (G.background || !G.curscreen || (R.flag & R_RENDERING)) { vprintf(nfmt, ap); printf("\n"); } else { |