bdfe7d89e2
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416 Issues: * GHOST/X11 had conflicting changes. Some code was added in 2.5, which was later added in trunk also, but reverted partially, specifically revision 16683. I have left out this reversion in the 2.5 branch since I think it is needed there. http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683 * Scons had various conflicting changes, I decided to go with trunk version for everything except priorities and some library renaming. * In creator.c, there were various fixes and fixes for fixes related to the -w -W and -p options. In 2.5 -w and -W is not coded yet, and -p is done differently. Since this is changed so much, and I don't think those fixes would be needed in 2.5, I've left them out. * Also in creator.c: there was code for a python bugfix where the screen was not initialized when running with -P. The code that initializes the screen there I had to disable, that can't work in 2.5 anymore but left it commented as a reminder. Further I had to disable some new function calls. using src/ and python/, as was done already in this branch, disabled function calls: * bpath.c: error reporting * BME_conversions.c: editmesh conversion functions. * SHD_dynamic: disabled almost completely, there is no python/. * KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled. * text.c: clipboard copy call. * object.c: OB_SUPPORT_MATERIAL. * DerivedMesh.c and subsurf_ccg, stipple_quarttone. Still to be done: * Go over files and functions that were moved to a different location but could still use changes that were done in trunk.
137 lines
2.9 KiB
C
137 lines
2.9 KiB
C
/*
|
|
* $Id$
|
|
*
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
|
* All rights reserved.
|
|
*
|
|
* The Original Code is: all of this file.
|
|
*
|
|
* Contributor(s): none yet.
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
#include <math.h>
|
|
|
|
#include "DNA_screen_types.h"
|
|
#include "DNA_space_types.h"
|
|
#include "BLI_blenlib.h"
|
|
|
|
#include "BKE_screen.h"
|
|
|
|
#include "BPY_extern.h"
|
|
|
|
/* keep global; this has to be accessible outside of windowmanager */
|
|
static ListBase spacetypes= {NULL, NULL};
|
|
|
|
SpaceType *BKE_spacetype_from_id(int spaceid)
|
|
{
|
|
SpaceType *st;
|
|
|
|
for(st= spacetypes.first; st; st= st->next) {
|
|
if(st->spaceid==spaceid)
|
|
return st;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
const ListBase *BKE_spacetypes_list()
|
|
{
|
|
return &spacetypes;
|
|
}
|
|
|
|
void BKE_spacetype_register(SpaceType *st)
|
|
{
|
|
BLI_addtail(&spacetypes, st);
|
|
}
|
|
|
|
void BKE_spacedata_freelist(ListBase *lb)
|
|
{
|
|
SpaceLink *sl;
|
|
|
|
for (sl= lb->first; sl; sl= sl->next) {
|
|
SpaceType *st= BKE_spacetype_from_id(sl->spacetype);
|
|
|
|
if(st && st->free)
|
|
st->free(sl);
|
|
}
|
|
|
|
BLI_freelistN(lb);
|
|
}
|
|
|
|
/* lb1 should be empty */
|
|
void BKE_spacedata_copylist(ListBase *lb1, ListBase *lb2)
|
|
{
|
|
SpaceLink *sl;
|
|
|
|
lb1->first= lb2->last= NULL; /* to be sure */
|
|
|
|
for (sl= lb2->first; sl; sl= sl->next) {
|
|
SpaceType *st= BKE_spacetype_from_id(sl->spacetype);
|
|
|
|
if(st && st->duplicate)
|
|
BLI_addtail(lb1, st->duplicate(sl));
|
|
}
|
|
}
|
|
|
|
/* not region itself */
|
|
void BKE_area_region_free(ARegion *ar)
|
|
{
|
|
if(ar->type && ar->type->free)
|
|
ar->type->free(ar);
|
|
}
|
|
|
|
/* not area itself */
|
|
void BKE_screen_area_free(ScrArea *sa)
|
|
{
|
|
ARegion *ar;
|
|
|
|
for(ar=sa->regionbase.first; ar; ar=ar->next)
|
|
BKE_area_region_free(ar);
|
|
|
|
BKE_spacedata_freelist(&sa->spacedata);
|
|
|
|
BLI_freelistN(&sa->regionbase);
|
|
BLI_freelistN(&sa->actionzones);
|
|
|
|
BLI_freelistN(&sa->panels);
|
|
// uiFreeBlocks(&sa->uiblocks);
|
|
// uiFreePanels(&sa->panels);
|
|
|
|
BPY_free_scriptlink(&sa->scriptlink);
|
|
|
|
}
|
|
|
|
/* don't free screen itself */
|
|
void free_screen(bScreen *sc)
|
|
{
|
|
ScrArea *sa;
|
|
|
|
for(sa= sc->areabase.first; sa; sa= sa->next)
|
|
BKE_screen_area_free(sa);
|
|
|
|
BLI_freelistN(&sc->vertbase);
|
|
BLI_freelistN(&sc->edgebase);
|
|
BLI_freelistN(&sc->areabase);
|
|
}
|
|
|
|
|