diff options
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/area/Makefile | 10 | ||||
-rw-r--r-- | source/blender/editors/area/space.c | 246 | ||||
-rw-r--r-- | source/blender/editors/include/ED_area.h | 43 | ||||
-rw-r--r-- | source/blender/editors/include/ED_interface.h | 33 | ||||
-rw-r--r-- | source/blender/editors/include/ED_mesh.h | 33 | ||||
-rw-r--r-- | source/blender/editors/include/ED_object.h | 33 | ||||
-rw-r--r-- | source/blender/editors/include/ED_screen.h | 34 | ||||
-rw-r--r-- | source/blender/editors/include/ED_transform.h | 33 | ||||
-rw-r--r-- | source/blender/editors/interface/Makefile | 52 | ||||
-rw-r--r-- | source/blender/editors/mesh/Makefile | 52 | ||||
-rw-r--r-- | source/blender/editors/object/Makefile | 52 | ||||
-rw-r--r-- | source/blender/editors/screen/Makefile | 13 | ||||
-rw-r--r-- | source/blender/editors/screen/ed_screen.c | 29 | ||||
-rw-r--r-- | source/blender/editors/transform/Makefile | 52 |
14 files changed, 704 insertions, 11 deletions
diff --git a/source/blender/editors/area/Makefile b/source/blender/editors/area/Makefile index 8e41651294a..c7b6d39bcca 100644 --- a/source/blender/editors/area/Makefile +++ b/source/blender/editors/area/Makefile @@ -38,10 +38,12 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(OPENGL_HEADERS) # not very neat.... -CPPFLAGS += -I../../../blenkernel -CPPFLAGS += -I../../../blenlib -CPPFLAGS += -I../../../makesdna -CPPFLAGS += -I../../../imbuf +CPPFLAGS += -I../../windowmanager +CPPFLAGS += -I../../blenloader +CPPFLAGS += -I../../blenkernel +CPPFLAGS += -I../../blenlib +CPPFLAGS += -I../../makesdna +CPPFLAGS += -I../../imbuf CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include # own include diff --git a/source/blender/editors/area/space.c b/source/blender/editors/area/space.c new file mode 100644 index 00000000000..2ade78f93e4 --- /dev/null +++ b/source/blender/editors/area/space.c @@ -0,0 +1,246 @@ +/** + * $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) 2007 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Blender Foundation + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#include <string.h> +#include <stdio.h> + +#include "MEM_guardedalloc.h" + +#include "IMB_imbuf_types.h" +#include "IMB_imbuf.h" + +#include "BLI_blenlib.h" +#include "BLI_arithb.h" + +#include "BKE_global.h" +#include "BKE_colortools.h" + +#include "BLO_readfile.h" + +#include "WM_api.h" + +#include "ED_area.h" +#include "ED_screen.h" + +void freespacelist(ScrArea *sa) +{ + SpaceLink *sl; + + for (sl= sa->spacedata.first; sl; sl= sl->next) { + if(sl->spacetype==SPACE_FILE) { + SpaceFile *sfile= (SpaceFile*) sl; + if(sfile->libfiledata) + BLO_blendhandle_close(sfile->libfiledata); + if(sfile->filelist) + ; // XXX freefilelist(sfile); + if(sfile->pupmenu) + MEM_freeN(sfile->pupmenu); + } + else if(sl->spacetype==SPACE_BUTS) { + SpaceButs *buts= (SpaceButs*) sl; +// if(buts->ri) { +// if (buts->ri->rect) MEM_freeN(buts->ri->rect); +// MEM_freeN(buts->ri); +// XXX } + if(G.buts==buts) G.buts= NULL; + } + else if(sl->spacetype==SPACE_IPO) { + SpaceIpo *si= (SpaceIpo*) sl; + if(si->editipo) MEM_freeN(si->editipo); +// XXX free_ipokey(&si->ipokey); + if(G.sipo==si) G.sipo= NULL; + } + else if(sl->spacetype==SPACE_VIEW3D) { + View3D *vd= (View3D*) sl; + if(vd->bgpic) { + if(vd->bgpic->ima) vd->bgpic->ima->id.us--; + MEM_freeN(vd->bgpic); + } + if(vd->localvd) MEM_freeN(vd->localvd); + if(vd->clipbb) MEM_freeN(vd->clipbb); + if(vd->depths) { +// XXX if(vd->depths->depths) MEM_freeN(vd->depths->depths); + MEM_freeN(vd->depths); + vd->depths= NULL; + } +// XXX retopo_free_view_data(vd); + if(vd->properties_storage) MEM_freeN(vd->properties_storage); + if(G.vd==vd) G.vd= NULL; + if(vd->ri) { +// XXX BIF_view3d_previewrender_free(vd); + } + } + else if(sl->spacetype==SPACE_OOPS) { +// XXX SpaceOops *so= (SpaceOops *) sl; +// XXX free_oopspace(so); + } + else if(sl->spacetype==SPACE_IMASEL) { +// XXX SpaceImaSel *simasel= (SpaceImaSel*) sl; +// XXX free_imasel(simasel); + } + else if(sl->spacetype==SPACE_ACTION) { +// XXX free_actionspace((SpaceAction*)sl); + } + else if(sl->spacetype==SPACE_NLA){ + /* free_nlaspace((SpaceNla*)sl); */ + } + else if(sl->spacetype==SPACE_TEXT) { +// XXX free_textspace((SpaceText *)sl); + } + else if(sl->spacetype==SPACE_SCRIPT) { +// XXX free_scriptspace((SpaceScript *)sl); + } + else if(sl->spacetype==SPACE_SOUND) { +// XXX free_soundspace((SpaceSound *)sl); + } + else if(sl->spacetype==SPACE_IMAGE) { + SpaceImage *sima= (SpaceImage *)sl; + if(sima->cumap) + curvemapping_free(sima->cumap); + if(sima->info_str) + MEM_freeN(sima->info_str); + if(sima->info_spare) + MEM_freeN(sima->info_spare); + if(sima->spare) + IMB_freeImBuf(sima->spare); + } + else if(sl->spacetype==SPACE_NODE) { + /* SpaceNode *snode= (SpaceNode *)sl; */ + } + } + + BLI_freelistN(&sa->spacedata); +} + +/* can be called for area-full, so it should keep interesting stuff */ +void duplicatespacelist(ScrArea *newarea, ListBase *lb1, ListBase *lb2) +{ + SpaceLink *sl; + + BLI_duplicatelist(lb1, lb2); + + /* lb1 is copy from lb2, from lb2 we free stuff, rely on event system to properly re-alloc */ + + sl= lb2->first; + while(sl) { + if(sl->spacetype==SPACE_FILE) { + SpaceFile *sfile= (SpaceFile*) sl; + sfile->libfiledata= NULL; + sfile->filelist= NULL; + sfile->pupmenu= NULL; + sfile->menup= NULL; + } + else if(sl->spacetype==SPACE_VIEW3D) { + View3D *v3d= (View3D*)sl; +// XXX BIF_view3d_previewrender_free(v3d); + v3d->depths= NULL; + v3d->retopo_view_data= NULL; + } + else if(sl->spacetype==SPACE_OOPS) { + SpaceOops *so= (SpaceOops *)sl; + so->oops.first= so->oops.last= NULL; + so->tree.first= so->tree.last= NULL; + so->treestore= NULL; + } + else if(sl->spacetype==SPACE_IMASEL) { + SpaceImaSel *simasel= (SpaceImaSel*) sl; + simasel->pupmenu= NULL; + simasel->menup= NULL; +// XXX simasel->files = BIF_filelist_new(); +// XXX BIF_filelist_setdir(simasel->files, simasel->dir); +// XXX BIF_filelist_settype(simasel->files, simasel->type); + /* see SPACE_FILE - elubie */ + } + else if(sl->spacetype==SPACE_NODE) { + SpaceNode *snode= (SpaceNode *)sl; + snode->nodetree= NULL; + } + + sl= sl->next; + } + + /* but some things we copy */ + + sl= lb1->first; + while(sl) { + sl->area= newarea; + + if(sl->spacetype==SPACE_BUTS) { + SpaceButs *buts= (SpaceButs *)sl; + buts->ri= NULL; + } + else if(sl->spacetype==SPACE_FILE) { + SpaceFile *sfile= (SpaceFile*) sl; + sfile->menup= NULL; + } + else if(sl->spacetype==SPACE_IPO) { + SpaceIpo *si= (SpaceIpo *)sl; + si->editipo= NULL; + si->ipokey.first= si->ipokey.last= NULL; + } + else if(sl->spacetype==SPACE_VIEW3D) { + View3D *vd= (View3D *)sl; + if(vd->bgpic) { + vd->bgpic= MEM_dupallocN(vd->bgpic); + if(vd->bgpic->ima) vd->bgpic->ima->id.us++; + } + vd->clipbb= MEM_dupallocN(vd->clipbb); + vd->ri= NULL; + vd->properties_storage= NULL; + } + else if(sl->spacetype==SPACE_IMAGE) { + SpaceImage *sima= (SpaceImage *)sl; + if(sima->cumap) + sima->cumap= curvemapping_copy(sima->cumap); + if(sima->info_str) + sima->info_str= MEM_dupallocN(sima->info_str); + if(sima->info_spare) + sima->info_spare= MEM_dupallocN(sima->info_spare); + } + sl= sl->next; + } + + /* again: from old View3D restore localview (because full) */ + sl= lb2->first; + while(sl) { + if(sl->spacetype==SPACE_VIEW3D) { + View3D *v3d= (View3D*) sl; + if(v3d->localvd) { +// XXX restore_localviewdata(v3d); + v3d->localvd= NULL; + v3d->properties_storage= NULL; + v3d->localview= 0; + v3d->lay &= 0xFFFFFF; + } + } + sl= sl->next; + } +} + + + diff --git a/source/blender/editors/include/ED_area.h b/source/blender/editors/include/ED_area.h new file mode 100644 index 00000000000..cc11ca9a2f6 --- /dev/null +++ b/source/blender/editors/include/ED_area.h @@ -0,0 +1,43 @@ +/** + * $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) 2008 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Blender Foundation + * + * ***** END GPL LICENSE BLOCK ***** + */ +#ifndef ED_AREA_H +#define ED_AREA_H + + +#include "DNA_screen_types.h" +#include "DNA_space_types.h" +#include "DNA_view2d_types.h" +#include "DNA_view3d_types.h" + +void freespacelist(ScrArea *sa); +void duplicatespacelist(ScrArea *newarea, struct ListBase *lb1, struct ListBase *lb2); + + + +#endif /* ED_AREA_H */ + diff --git a/source/blender/editors/include/ED_interface.h b/source/blender/editors/include/ED_interface.h new file mode 100644 index 00000000000..d0f3078ce62 --- /dev/null +++ b/source/blender/editors/include/ED_interface.h @@ -0,0 +1,33 @@ +/** + * $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) 2008 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Blender Foundation + * + * ***** END GPL LICENSE BLOCK ***** + */ +#ifndef ED_INTERFACE_H +#define ED_INTERFACE_H + + +#endif /* ED_INTERFACE_H */ + diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h new file mode 100644 index 00000000000..be47fb6f2d0 --- /dev/null +++ b/source/blender/editors/include/ED_mesh.h @@ -0,0 +1,33 @@ +/** + * $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) 2008 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Blender Foundation + * + * ***** END GPL LICENSE BLOCK ***** + */ +#ifndef ED_AREA_H +#define ED_AREA_H + + +#endif /* ED_AREA_H */ + diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h new file mode 100644 index 00000000000..ad55a691d6d --- /dev/null +++ b/source/blender/editors/include/ED_object.h @@ -0,0 +1,33 @@ +/** + * $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) 2008 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Blender Foundation + * + * ***** END GPL LICENSE BLOCK ***** + */ +#ifndef ED_OBJECT_H +#define ED_OBJECT_H + + +#endif /* ED_OBJECT_H */ + diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h new file mode 100644 index 00000000000..c194632b46f --- /dev/null +++ b/source/blender/editors/include/ED_screen.h @@ -0,0 +1,34 @@ +/** + * $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) 2008 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Blender Foundation + * + * ***** END GPL LICENSE BLOCK ***** + */ +#ifndef ED_SCREEN_H +#define ED_SCREEN_H + +#include "DNA_screen_types.h" + +#endif /* ED_SCREEN_H */ + diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h new file mode 100644 index 00000000000..1d47d8ad190 --- /dev/null +++ b/source/blender/editors/include/ED_transform.h @@ -0,0 +1,33 @@ +/** + * $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) 2008 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Blender Foundation + * + * ***** END GPL LICENSE BLOCK ***** + */ +#ifndef ED_TRANSFORM_H +#define ED_TRANSFORM_H + + +#endif /* ED_TRANSFORM_H */ + diff --git a/source/blender/editors/interface/Makefile b/source/blender/editors/interface/Makefile new file mode 100644 index 00000000000..b2aeaa145f7 --- /dev/null +++ b/source/blender/editors/interface/Makefile @@ -0,0 +1,52 @@ +# +# $Id: Makefile 14 2002-10-13 15:57:19Z hans $ +# +# ***** 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) 2007 Blender Foundation +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): none yet. +# +# ***** END GPL LICENSE BLOCK ***** +# +# Makes module object directory and bounces make to subdirectories. + +LIBNAME = ed_screen +DIR = $(OCGDIR)/blender/$(LIBNAME) + +include nan_compile.mk + +CFLAGS += $(LEVEL_1_C_WARNINGS) + +CPPFLAGS += -I$(OPENGL_HEADERS) + +CPPFLAGS += -I$(NAN_BMFONT)/include +CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include + +CPPFLAGS += -I../../windowmanager +CPPFLAGS += -I../../blenkernel +CPPFLAGS += -I../../blenloader +CPPFLAGS += -I../../blenlib +CPPFLAGS += -I../../makesdna +CPPFLAGS += -I../../imbuf + +# own include + +CPPFLAGS += -I../include diff --git a/source/blender/editors/mesh/Makefile b/source/blender/editors/mesh/Makefile new file mode 100644 index 00000000000..b2aeaa145f7 --- /dev/null +++ b/source/blender/editors/mesh/Makefile @@ -0,0 +1,52 @@ +# +# $Id: Makefile 14 2002-10-13 15:57:19Z hans $ +# +# ***** 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) 2007 Blender Foundation +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): none yet. +# +# ***** END GPL LICENSE BLOCK ***** +# +# Makes module object directory and bounces make to subdirectories. + +LIBNAME = ed_screen +DIR = $(OCGDIR)/blender/$(LIBNAME) + +include nan_compile.mk + +CFLAGS += $(LEVEL_1_C_WARNINGS) + +CPPFLAGS += -I$(OPENGL_HEADERS) + +CPPFLAGS += -I$(NAN_BMFONT)/include +CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include + +CPPFLAGS += -I../../windowmanager +CPPFLAGS += -I../../blenkernel +CPPFLAGS += -I../../blenloader +CPPFLAGS += -I../../blenlib +CPPFLAGS += -I../../makesdna +CPPFLAGS += -I../../imbuf + +# own include + +CPPFLAGS += -I../include diff --git a/source/blender/editors/object/Makefile b/source/blender/editors/object/Makefile new file mode 100644 index 00000000000..b2aeaa145f7 --- /dev/null +++ b/source/blender/editors/object/Makefile @@ -0,0 +1,52 @@ +# +# $Id: Makefile 14 2002-10-13 15:57:19Z hans $ +# +# ***** 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) 2007 Blender Foundation +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): none yet. +# +# ***** END GPL LICENSE BLOCK ***** +# +# Makes module object directory and bounces make to subdirectories. + +LIBNAME = ed_screen +DIR = $(OCGDIR)/blender/$(LIBNAME) + +include nan_compile.mk + +CFLAGS += $(LEVEL_1_C_WARNINGS) + +CPPFLAGS += -I$(OPENGL_HEADERS) + +CPPFLAGS += -I$(NAN_BMFONT)/include +CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include + +CPPFLAGS += -I../../windowmanager +CPPFLAGS += -I../../blenkernel +CPPFLAGS += -I../../blenloader +CPPFLAGS += -I../../blenlib +CPPFLAGS += -I../../makesdna +CPPFLAGS += -I../../imbuf + +# own include + +CPPFLAGS += -I../include diff --git a/source/blender/editors/screen/Makefile b/source/blender/editors/screen/Makefile index bd6319cc7a0..b2aeaa145f7 100644 --- a/source/blender/editors/screen/Makefile +++ b/source/blender/editors/screen/Makefile @@ -37,13 +37,16 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(OPENGL_HEADERS) -# not very neat.... -CPPFLAGS += -I../../../blenkernel -CPPFLAGS += -I../../../blenlib -CPPFLAGS += -I../../../makesdna -CPPFLAGS += -I../../../imbuf +CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include +CPPFLAGS += -I../../windowmanager +CPPFLAGS += -I../../blenkernel +CPPFLAGS += -I../../blenloader +CPPFLAGS += -I../../blenlib +CPPFLAGS += -I../../makesdna +CPPFLAGS += -I../../imbuf + # own include CPPFLAGS += -I../include diff --git a/source/blender/editors/screen/ed_screen.c b/source/blender/editors/screen/ed_screen.c index ca3e11d1d64..5da65166c95 100644 --- a/source/blender/editors/screen/ed_screen.c +++ b/source/blender/editors/screen/ed_screen.c @@ -26,7 +26,32 @@ * ***** END GPL LICENSE BLOCK ***** */ -void unlink_screen() +#include "WM_api.h" + +#include "MEM_guardedalloc.h" + +#include "ED_area.h" +#include "ED_screen.h" + + +static void del_area(ScrArea *sa) +{ + + freespacelist(sa); + +// uiFreeBlocks(&sa->uiblocks); +// uiFreePanels(&sa->panels); + +// BPY_free_scriptlink(&sa->scriptlink); + +} + + +/* bad level to blenkernel, solve */ +void unlink_screen(bScreen *sc) { - /* bad level to blenkernel, solve */ + ScrArea *sa; + + for (sa= sc->areabase.first; sa; sa= sa->next) + del_area(sa); }
\ No newline at end of file diff --git a/source/blender/editors/transform/Makefile b/source/blender/editors/transform/Makefile new file mode 100644 index 00000000000..b2aeaa145f7 --- /dev/null +++ b/source/blender/editors/transform/Makefile @@ -0,0 +1,52 @@ +# +# $Id: Makefile 14 2002-10-13 15:57:19Z hans $ +# +# ***** 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) 2007 Blender Foundation +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): none yet. +# +# ***** END GPL LICENSE BLOCK ***** +# +# Makes module object directory and bounces make to subdirectories. + +LIBNAME = ed_screen +DIR = $(OCGDIR)/blender/$(LIBNAME) + +include nan_compile.mk + +CFLAGS += $(LEVEL_1_C_WARNINGS) + +CPPFLAGS += -I$(OPENGL_HEADERS) + +CPPFLAGS += -I$(NAN_BMFONT)/include +CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include + +CPPFLAGS += -I../../windowmanager +CPPFLAGS += -I../../blenkernel +CPPFLAGS += -I../../blenloader +CPPFLAGS += -I../../blenlib +CPPFLAGS += -I../../makesdna +CPPFLAGS += -I../../imbuf + +# own include + +CPPFLAGS += -I../include |