Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWillian Padovani Germano <wpgermano@gmail.com>2004-01-21 07:38:03 +0300
committerWillian Padovani Germano <wpgermano@gmail.com>2004-01-21 07:38:03 +0300
commit1652884463afa64ec000462e7a23d3267f980b25 (patch)
treeb9c6bb55ea9c56256c9eb4c42787bacb602e22bd /source/blender/src/drawscript.c
parent24bb131b7cd987018077418141e566c957f96527 (diff)
BPython:
-- removed struct Script (DNA_script_types.h) from makesdna to blender/include/BPI_script.h (BPI meaning Blender Python-related external Include file). Had agreed with Ton that makesdna was not the proper place for it. -- fixed two small warnings in Ipo.c (variables might be used uninitialized) -- fixed a bug reported on blender.org's python forum by Wim Van Hoydonck (aka tuinbels): Blender would hang if a script failed. My fault, accidentally put a node=node->next type call outside the while loop check, so it never ended. With makesdna/DNA_script_types.h removed and include/BPI_script.h added, msvc projectfiles will need to be updated. Sorry to do it now, but I promissed I'd fix this before next release.
Diffstat (limited to 'source/blender/src/drawscript.c')
-rw-r--r--source/blender/src/drawscript.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/src/drawscript.c b/source/blender/src/drawscript.c
index 950bd4f2989..e94834f5c7b 100644
--- a/source/blender/src/drawscript.c
+++ b/source/blender/src/drawscript.c
@@ -50,7 +50,6 @@
#include "BLI_blenlib.h"
-#include "DNA_script_types.h"
#include "DNA_space_types.h"
#include "DNA_screen_types.h"
#include "DNA_userdef_types.h"
@@ -60,6 +59,7 @@
#include "BKE_global.h"
#include "BKE_main.h"
+#include "BPI_script.h"
#include "BPY_extern.h"
#include "BIF_gl.h"
@@ -111,8 +111,12 @@ void winqreadscriptspace(struct ScrArea *sa, void *spacedata, struct BWinEvent *
if (script) {
BPY_spacescript_do_pywin_event(sc, event, val);
- if (!script->flags) /* finished with this script, let's free it */
+ if (!script->flags) {/* finished with this script, let's free it */
+ if (script->lastspace != SPACE_SCRIPT)
+ newspace (curarea, script->lastspace);
BPY_free_finished_script(script);
+ sc->script = NULL;
+ }
}
else {
if (event == QKEY)