tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Yuck, a very ancient crasher in going area-full screen in Blender. 

I wonder how this survived so long in Blender... (2005/03/09 commit).

Reason was the call to BPY_free_screen_spacehandlers(sc) in kernel,
which was freeing up scripthandlers in a weird way. That call is
really obsolete. The real freeing should go in the del_area() call,
to prevent copying and deleting area in the UI to go wrong.

(Crash happened in testing timeline markers, and holding CTRL+Uparrow
a while...)
This commit is contained in:
Ton Roosendaal 2006-11-17 12:44:15 +00:00
parent 414b918010
commit 6b9bf57066
5 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_bad_level_calls.h
View File

@ -66,7 +66,6 @@ struct Object;
void BPY_do_pyscript (struct ID *id, short int event);
void BPY_clear_script (struct Script *script);
void BPY_free_compiled_text (struct Text *text);
void BPY_free_screen_spacehandlers (struct bScreen *sc);
/* pydrivers */
struct Object **BPY_pydriver_get_objects(struct IpoDriver *driver);
float BPY_pydriver_eval(struct IpoDriver *driver);

1
source/blender/blenkernel/bad_level_call_stubs/stubs.c
View File

@ -109,7 +109,6 @@ void mainqenter (unsigned short event, short val){}
void BPY_do_pyscript(ID *id, short int event){}
void BPY_clear_script(Script *script){}
void BPY_free_compiled_text(struct Text *text){}
void BPY_free_screen_spacehandlers (struct bScreen *sc){}
void BPY_pydriver_update(void){}
float BPY_pydriver_eval(struct IpoDriver *driver)
{

1
source/blender/blenkernel/intern/screen.c
View File

@ -51,7 +51,6 @@ void free_screen(bScreen *sc)
{
unlink_screen(sc);
BPY_free_screen_spacehandlers(sc);
BLI_freelistN(&sc->vertbase);
BLI_freelistN(&sc->edgebase);
BLI_freelistN(&sc->areabase);

18
source/blender/python/BPY_interface.c
View File

@ -116,8 +116,6 @@ PyObject *blender_import( PyObject * self, PyObject * args );
void BPY_Err_Handle( char *script_name );
PyObject *traceback_getFilename( PyObject * tb );
void BPY_free_screen_spacehandlers(struct bScreen *sc);
/****************************************************************************
* Description: This function will start the interpreter and load all modules
* as well as search for a python installation.
@ -1648,23 +1646,19 @@ int BPY_do_spacehandlers( ScrArea *sa, unsigned short event,
void BPY_free_scriptlink( struct ScriptLink *slink )
{
if( slink->totscript ) {
if( slink->flag )
if( slink->flag ) {
MEM_freeN( slink->flag );
if( slink->scripts )
slink->flag= NULL;
}
if( slink->scripts ) {
MEM_freeN( slink->scripts );
slink->scripts= NULL;
}
}
return;
}
void BPY_free_screen_spacehandlers(struct bScreen *sc)
{
ScrArea *sa;
for (sa = sc->areabase.first; sa; sa = sa->next)
BPY_free_scriptlink(&sa->scriptlink);
}
static int CheckAllSpaceHandlers(Text *text)
{
bScreen *screen;

6
source/blender/src/editscreen.c
View File

@ -1836,8 +1836,10 @@ static void del_area(ScrArea *sa)
uiFreeBlocks(&sa->uiblocks);
uiFreePanels(&sa->panels);
if(sa==curarea) curarea= 0;
if(sa==g_activearea) g_activearea= 0;
BPY_free_scriptlink(&sa->scriptlink);
if(sa==curarea) curarea= NULL;
if(sa==g_activearea) g_activearea= NULL;
}
/* sa2 to sa1 */