diff options
author | Willian Padovani Germano <wpgermano@gmail.com> | 2003-12-15 21:18:09 +0300 |
---|---|---|
committer | Willian Padovani Germano <wpgermano@gmail.com> | 2003-12-15 21:18:09 +0300 |
commit | 050dc02134d71ba984fd1dd900ffccf45cbd6865 (patch) | |
tree | c439c24bbc22034b3ac0b7419cacc41865a1c62d /source/blender/python/BPY_interface.c | |
parent | 436bb963f128b96f871d1ae7fa651cf7c9d810d1 (diff) |
Chris reported build errors w/ traditional makefiles.
This commit moves the 2 undefined references to BPY_interface.c and
changes things a little, hopefully fixing the problem. I had to add a new dir,
source/blender/include/ to auto*'s Makefile.am in source/blender/python/.
Thanks Chris for the report, and Jiri, for adding a missing declaration.
Diffstat (limited to 'source/blender/python/BPY_interface.c')
-rw-r--r-- | source/blender/python/BPY_interface.c | 70 |
1 files changed, 68 insertions, 2 deletions
diff --git a/source/blender/python/BPY_interface.c b/source/blender/python/BPY_interface.c index 6ca1b415d48..8f6e813a9e2 100644 --- a/source/blender/python/BPY_interface.c +++ b/source/blender/python/BPY_interface.c @@ -41,6 +41,8 @@ #include <MEM_guardedalloc.h> #include <BLI_blenlib.h> /* for BLI_last_slash() */ +#include <BIF_space.h> +#include <BIF_screen.h> #include <BKE_global.h> #include <BKE_library.h> #include <BKE_main.h> @@ -384,8 +386,11 @@ int BPY_txt_do_python(struct SpaceText* st) /* check if this text is already running */ while (script) { if (!strcmp(script->id.name+2, st->text->id.name+2)) { - /* if this text is already a running script, just move to it: */ - EXPP_move_to_spacescript (script); + /* if this text is already a running script, just move to it: */ + SpaceScript *sc; + newspace(curarea, SPACE_SCRIPT); + sc = curarea->spacedata.first; + sc->script = script; return 1; } script = script->id.next; @@ -458,6 +463,67 @@ void BPY_free_compiled_text(struct Text* text) return; } + +/*****************************************************************************/ +/* Description: This function frees a finished (flags == 0) script. */ +/*****************************************************************************/ +void BPY_free_finished_script(Script *script) +{ + if (!script) return; + + if (script->lastspace != SPACE_SCRIPT) + newspace (curarea, script->lastspace); + + free_libblock(&G.main->script, script); + return; +} + +void unlink_script(Script *script) +{ /* copied from unlink_text in drawtext.c */ + bScreen *scr; + ScrArea *area; + SpaceLink *sl; + + for (scr= G.main->screen.first; scr; scr= scr->id.next) { + for (area= scr->areabase.first; area; area= area->next) { + for (sl= area->spacedata.first; sl; sl= sl->next) { + if (sl->spacetype==SPACE_SCRIPT) { + SpaceScript *sc= (SpaceScript*) sl; + + if (sc->script==script) { + sc->script= NULL; + + if (sc==area->spacedata.first) { + scrarea_queue_redraw(area); + } + } + } + } + } + } +} + +void BPY_clear_script (Script *script) +{ + PyObject *dict; + + if (!script) return; + + Py_XDECREF((PyObject *)script->py_draw); + Py_XDECREF((PyObject *)script->py_event); + Py_XDECREF((PyObject *)script->py_button); + + dict = script->py_globaldict; + + if (dict) { + PyDict_Clear (dict); + Py_DECREF (dict); /* Release dictionary. */ + script->py_globaldict = NULL; + } + + unlink_script (script); +} + /*****************************************************************************/ /* ScriptLinks */ /*****************************************************************************/ |