diff options
author | Ton Roosendaal <ton@blender.org> | 2007-12-24 21:38:03 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2007-12-24 21:38:03 +0300 |
commit | c79966be52e251cc7b1028ea4d3012b44eb6a8af (patch) | |
tree | f4007ee279b01ad9075971fd63159a02aa29d904 /source/blender/blenkernel/intern | |
parent | a1c8543f2acd7086d412cb794b32f96794b00659 (diff) |
Blenkernel for 2.5 project, changes mainly are because of disabling
bad level calls. (which is not finished at all)
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/blender.c | 88 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/displist.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/effect.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/font.c | 40 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/idprop.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 9 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/library.c | 24 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mball.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sca.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/screen.c | 11 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/texture.c | 2 |
13 files changed, 129 insertions, 71 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 9845f571126..f09c1103922 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -47,12 +47,16 @@ #include "MEM_guardedalloc.h" +#include "DNA_curve_types.h" #include "DNA_listBase.h" #include "DNA_sdna_types.h" #include "DNA_userdef_types.h" #include "DNA_object_types.h" -#include "DNA_curve_types.h" +#include "DNA_mesh_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" +#include "DNA_sound_types.h" +#include "DNA_sequence_types.h" #include "BLI_blenlib.h" #include "BLI_dynstr.h" @@ -60,9 +64,6 @@ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "DNA_mesh_types.h" -#include "DNA_screen_types.h" - #include "BKE_blender.h" #include "BKE_curve.h" #include "BKE_depsgraph.h" @@ -89,8 +90,10 @@ #include "nla.h" #include "blendef.h" + Global G; UserDef U; +ListBase WMlist= {NULL, NULL}; char versionstr[48]= ""; @@ -313,7 +316,10 @@ static void clean_paths(Main *main) } } -static void setup_app_data(BlendFileData *bfd, char *filename) +/* context matching */ +/* handle no-ui case */ + +static void setup_app_data(bContext *C, BlendFileData *bfd, char *filename) { Object *ob; bScreen *curscreen= NULL; @@ -327,6 +333,8 @@ static void setup_app_data(BlendFileData *bfd, char *filename) clean_paths(bfd->main); + /* XXX here the complex windowmanager matching */ + /* no load screens? */ if(mode) { /* comes from readfile.c */ @@ -335,7 +343,7 @@ static void setup_app_data(BlendFileData *bfd, char *filename) SWAP(ListBase, G.main->screen, bfd->main->screen); /* we re-use current screen */ - curscreen= G.curscreen; + curscreen= C->screen; /* but use new Scene pointer */ curscene= bfd->curscene; if(curscene==NULL) curscene= bfd->main->scene.first; @@ -346,11 +354,13 @@ static void setup_app_data(BlendFileData *bfd, char *filename) lib_link_screen_restore(bfd->main, curscene); } - clear_global(); /* free Main database */ + /* free G.main Main database */ + clear_global(); if(mode!='u') G.save_over = 1; G.main= bfd->main; + if (bfd->user) { /* only here free userdef themes... */ @@ -358,7 +368,6 @@ static void setup_app_data(BlendFileData *bfd, char *filename) U= *bfd->user; MEM_freeN(bfd->user); - } /* samples is a global list... */ @@ -366,20 +375,20 @@ static void setup_app_data(BlendFileData *bfd, char *filename) /* case G_FILE_NO_UI or no screens in file */ if(mode) { - G.curscreen= curscreen; - G.scene= curscene; + C->screen= curscreen; + C->scene= curscene; } else { G.winpos= bfd->winpos; G.displaymode= bfd->displaymode; G.fileflags= bfd->fileflags; - G.curscreen= bfd->curscreen; - G.scene= G.curscreen->scene; + C->screen= bfd->curscreen; + C->scene= C->screen->scene; } /* this can happen when active scene was lib-linked, and doesnt exist anymore */ - if(G.scene==NULL) { - G.scene= G.main->scene.first; - G.curscreen->scene= G.scene; + if(C->scene==NULL) { + C->scene= G.main->scene.first; + C->screen->scene= C->scene; } /* special cases, override loaded flags: */ @@ -390,11 +399,11 @@ static void setup_app_data(BlendFileData *bfd, char *filename) G.f= bfd->globalf; if (!G.background) { - setscreen(G.curscreen); + //setscreen(G.curscreen); } /* baseflags, groups, make depsgraph, etc */ - set_scene_bg(G.scene); + set_scene_bg(C->scene); /* last stage of do_versions actually, that sets recalc flags for recalc poses */ for(ob= G.main->object.first; ob; ob= ob->id.next) { @@ -403,7 +412,7 @@ static void setup_app_data(BlendFileData *bfd, char *filename) } /* now tag update flags, to ensure deformers get calculated on redraw */ - DAG_scene_update_flags(G.scene, G.scene->lay); + DAG_scene_update_flags(C->scene, C->scene->lay); if (G.f & G_DOSCRIPTLINKS) { /* there's an onload scriptlink to execute in screenmain */ @@ -437,7 +446,7 @@ static void handle_subversion_warning(Main *main) 2: OK, and with new user settings */ -int BKE_read_file(char *dir, void *type_r) +int BKE_read_file(bContext *C, char *dir, void *unused) { BlendReadError bre; BlendFileData *bfd; @@ -449,10 +458,8 @@ int BKE_read_file(char *dir, void *type_r) bfd= BLO_read_from_file(dir, &bre); if (bfd) { if(bfd->user) retval= 2; - if (type_r) - *((BlenFileType*)type_r)= bfd->type; - setup_app_data(bfd, dir); + setup_app_data(C, bfd, dir); handle_subversion_warning(G.main); } @@ -466,7 +473,7 @@ int BKE_read_file(char *dir, void *type_r) return (bfd?retval:0); } -int BKE_read_file_from_memory(char* filebuf, int filelength, void *type_r) +int BKE_read_file_from_memory(bContext *C, char* filebuf, int filelength, void *unused) { BlendReadError bre; BlendFileData *bfd; @@ -475,11 +482,8 @@ int BKE_read_file_from_memory(char* filebuf, int filelength, void *type_r) waitcursor(1); bfd= BLO_read_from_memory(filebuf, filelength, &bre); - if (bfd) { - if (type_r) - *((BlenFileType*)type_r)= bfd->type; - - setup_app_data(bfd, "<memory>"); + if (bfd) { + setup_app_data(C, bfd, "<memory>"); } else { error("Loading failed: %s", BLO_bre_as_string(bre)); } @@ -491,7 +495,7 @@ int BKE_read_file_from_memory(char* filebuf, int filelength, void *type_r) } /* memfile is the undo buffer */ -int BKE_read_file_from_memfile(MemFile *memfile) +int BKE_read_file_from_memfile(bContext *C, MemFile *memfile) { BlendReadError bre; BlendFileData *bfd; @@ -501,7 +505,7 @@ int BKE_read_file_from_memfile(MemFile *memfile) bfd= BLO_read_from_memfile(G.sce, memfile, &bre); if (bfd) { - setup_app_data(bfd, "<memory>"); + setup_app_data(C, bfd, "<memory>"); } else { error("Loading failed: %s", BLO_bre_as_string(bre)); } @@ -529,7 +533,7 @@ static ListBase undobase={NULL, NULL}; static UndoElem *curundo= NULL; -static int read_undosave(UndoElem *uel) +static int read_undosave(bContext *C, UndoElem *uel) { char scestr[FILE_MAXDIR+FILE_MAXFILE]; int success=0, fileflags; @@ -539,9 +543,9 @@ static int read_undosave(UndoElem *uel) G.fileflags |= G_FILE_NO_UI; if(UNDO_DISK) - success= BKE_read_file(uel->str, NULL); + success= BKE_read_file(C, uel->str, NULL); else - success= BKE_read_file_from_memfile(&uel->memfile); + success= BKE_read_file_from_memfile(C, &uel->memfile); /* restore */ strcpy(G.sce, scestr); @@ -551,7 +555,7 @@ static int read_undosave(UndoElem *uel) } /* name can be a dynamic string */ -void BKE_write_undo(char *name) +void BKE_write_undo(bContext *C, char *name) { int nr, success; UndoElem *uel; @@ -604,7 +608,7 @@ void BKE_write_undo(char *name) sprintf(numstr, "%d.blend", counter); BLI_make_file_string("/", tstr, U.tempdir, numstr); - success= BLO_write_file(tstr, G.fileflags, &err); + success= BLO_write_file(C, tstr, G.fileflags, &err); strcpy(curundo->str, tstr); } @@ -614,17 +618,17 @@ void BKE_write_undo(char *name) if(curundo->prev) prevfile= &(curundo->prev->memfile); - success= BLO_write_file_mem(prevfile, &curundo->memfile, G.fileflags, &err); + success= BLO_write_file_mem(C, prevfile, &curundo->memfile, G.fileflags, &err); } } /* 1= an undo, -1 is a redo. we have to make sure 'curundo' remains at current situation */ -void BKE_undo_step(int step) +void BKE_undo_step(bContext *C, int step) { if(step==0) { - read_undosave(curundo); + read_undosave(C, curundo); } else if(step==1) { /* curundo should never be NULL, after restart or load file it should call undo_save */ @@ -632,7 +636,7 @@ void BKE_undo_step(int step) else { if(G.f & G_DEBUG) printf("undo %s\n", curundo->name); curundo= curundo->prev; - read_undosave(curundo); + read_undosave(C, curundo); } } else { @@ -641,7 +645,7 @@ void BKE_undo_step(int step) if(curundo==NULL || curundo->next==NULL) error("No redo available"); else { - read_undosave(curundo->next); + read_undosave(C, curundo->next); curundo= curundo->next; if(G.f & G_DEBUG) printf("redo %s\n", curundo->name); } @@ -663,7 +667,7 @@ void BKE_reset_undo(void) } /* based on index nr it does a restore */ -void BKE_undo_number(int nr) +void BKE_undo_number(bContext *C, int nr) { UndoElem *uel; int a=1; @@ -672,7 +676,7 @@ void BKE_undo_number(int nr) if(a==nr) break; } curundo= uel; - BKE_undo_step(0); + BKE_undo_step(C, 0); } char *BKE_undo_menu_string(void) diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index a9f009cd876..a9b260536a2 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -531,6 +531,7 @@ static void mesh_create_shadedColors(Render *re, Object *ob, int onlyForMesh, un } for (i=0; i<totface; i++) { + extern Material defmaterial; /* material.c */ MFace *mf= &mface[i]; Material *ma= give_current_material(ob, mf->mat_nr+1); int j, vidx[4], nverts= mf->v4?4:3; @@ -642,6 +643,8 @@ void shadeDispList(Base *base) dl= cu->disp.first; while(dl) { + extern Material defmaterial; /* material.c */ + dlob= MEM_callocN(sizeof(DispList), "displistshade"); BLI_addtail(&ob->disp, dlob); dlob->type= DL_VERTCOL; @@ -712,6 +715,7 @@ void shadeDispList(Base *base) if(dl->type==DL_INDEX4) { if(dl->nors) { + extern Material defmaterial; /* material.c */ if(dl->col1) MEM_freeN(dl->col1); col1= dl->col1= MEM_mallocN(sizeof(int)*dl->nr, "col1"); diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 1b345616888..a6946081730 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -60,7 +60,6 @@ #include "BKE_action.h" #include "BKE_anim.h" /* needed for where_on_path */ #include "BKE_armature.h" -#include "BKE_bad_level_calls.h" #include "BKE_blender.h" #include "BKE_constraint.h" #include "BKE_deform.h" @@ -94,7 +93,10 @@ #include <string.h> #endif // DISABLE_ELBEEM +#include "BIF_screen.h" + /* temporal struct, used for reading return of mesh_get_mapped_verts_nors() */ + typedef struct VeNoCo { float co[3], no[3]; } VeNoCo; diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index fc11b3d234d..2a2547fd839 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -73,6 +73,8 @@ struct SelBox *selboxes= NULL; +static ListBase ttfdata= {NULL, NULL}; + /* UTF-8 <-> wchar transformations */ void chtoutf8(unsigned long c, char *o) @@ -253,22 +255,46 @@ static PackedFile *get_builtin_packedfile(void) } } -static VFontData *vfont_get_data(VFont *vfont) +void free_ttfont(void) +{ + struct TmpFont *tf; + + tf= ttfdata.first; + while(tf) { + freePackedFile(tf->pf); + tf->pf= NULL; + tf->vfont= NULL; + tf= tf->next; + } + BLI_freelistN(&ttfdata); +} + +struct TmpFont *vfont_find_tmpfont(VFont *vfont) { struct TmpFont *tmpfnt = NULL; - PackedFile *tpf; if(vfont==NULL) return NULL; // Try finding the font from font list - tmpfnt = G.ttfdata.first; - + tmpfnt = ttfdata.first; while(tmpfnt) { if(tmpfnt->vfont == vfont) break; tmpfnt = tmpfnt->next; } + return tmpfnt; +} + +static VFontData *vfont_get_data(VFont *vfont) +{ + struct TmpFont *tmpfnt = NULL; + PackedFile *tpf; + + if(vfont==NULL) return NULL; + + // Try finding the font from font list + tmpfnt = vfont_find_tmpfont(vfont); // And then set the data if (!vfont->data) { @@ -292,7 +318,7 @@ static VFontData *vfont_get_data(VFont *vfont) tmpfnt= (struct TmpFont *) MEM_callocN(sizeof(struct TmpFont), "temp_font"); tmpfnt->pf= tpf; tmpfnt->vfont= vfont; - BLI_addtail(&G.ttfdata, tmpfnt); + BLI_addtail(&ttfdata, tmpfnt); } } else { pf= newPackedFile(vfont->name); @@ -305,7 +331,7 @@ static VFontData *vfont_get_data(VFont *vfont) tmpfnt= (struct TmpFont *) MEM_callocN(sizeof(struct TmpFont), "temp_font"); tmpfnt->pf= tpf; tmpfnt->vfont= vfont; - BLI_addtail(&G.ttfdata, tmpfnt); + BLI_addtail(&ttfdata, tmpfnt); } } if(!pf) { @@ -385,7 +411,7 @@ VFont *load_vfont(char *name) tmpfnt= (struct TmpFont *) MEM_callocN(sizeof(struct TmpFont), "temp_font"); tmpfnt->pf= tpf; tmpfnt->vfont= vfont; - BLI_addtail(&G.ttfdata, tmpfnt); + BLI_addtail(&ttfdata, tmpfnt); } } diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index bf2a3aae11a..ed295a9319c 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -28,6 +28,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + #include "DNA_listBase.h" #include "DNA_ID.h" @@ -40,10 +44,6 @@ #include "MEM_guardedalloc.h" -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - #define BSTR_EQ(a, b) (*(a) == *(b) && !strcmp(a, b)) /* IDPropertyTemplate is a union in DNA_ID.h */ diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index ed944a3a4ea..31323e003bd 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -54,6 +54,7 @@ #include "DNA_scene_types.h" #include "DNA_camera_types.h" #include "DNA_texture_types.h" +#include "DNA_sequence_types.h" #include "DNA_userdef_types.h" #include "BLI_arithb.h" @@ -77,14 +78,12 @@ #include "RE_pipeline.h" -/* bad level; call to free_realtime_image */ -#include "BKE_bad_level_calls.h" - /* for stamp drawing to an image */ #include "BMF_Api.h" #include "blendef.h" #include "BSE_time.h" +#include "BDR_drawmesh.h" /* max int, to indicate we don't store sequences in ibuf */ #define IMA_NO_INDEX 0x7FEFEFEF @@ -812,8 +811,8 @@ static void stampdata(StampData *stamp_data, int do_prefix) } if (G.scene->r.stamp & R_STAMP_NOTE) { - if (do_prefix) sprintf(stamp_data->note, "Note %s", G.scene->r.stamp_udata); - else sprintf(stamp_data->note, "%s", G.scene->r.stamp_udata); + /* Never do prefix for Note */ + sprintf(stamp_data->note, "%s", G.scene->r.stamp_udata); } else { stamp_data->note[0] = '\0'; } diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index e81d3bac655..54575aeae7d 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -79,7 +79,7 @@ #include "DNA_effect_types.h" #include "DNA_brush_types.h" #include "DNA_particle_types.h" -#include "BKE_particle.h" +#include "DNA_windowmanager_types.h" #include "BLI_blenlib.h" #include "BLI_dynstr.h" @@ -113,6 +113,7 @@ #include "BKE_effect.h" #include "BKE_brush.h" #include "BKE_idprop.h" +#include "BKE_particle.h" #include "BPI_script.h" @@ -198,6 +199,8 @@ ListBase *wich_libbase(Main *mainlib, short type) return &(mainlib->brush); case ID_PA: return &(mainlib->particle); + case ID_WM: + return &(mainlib->wm); } return 0; } @@ -265,10 +268,11 @@ int set_listbasepointers(Main *main, ListBase **lb) lb[24]= &(main->object); lb[25]= &(main->scene); lb[26]= &(main->library); + lb[27]= &(main->wm); - lb[27]= NULL; + lb[28]= NULL; - return 27; + return 28; } /* *********** ALLOC AND FREE ***************** @@ -367,6 +371,9 @@ static ID *alloc_libblock_notest(short type) case ID_PA: id = MEM_callocN(sizeof(ParticleSettings), "ParticleSettings"); break; + case ID_WM: + id = MEM_callocN(sizeof(wmWindowManager), "Window manager"); + break; } return id; } @@ -427,6 +434,13 @@ static void free_library(Library *lib) /* no freeing needed for libraries yet */ } +static void (*free_windowmanager_cb)(bContext *, wmWindowManager *)= NULL; + +void set_free_windowmanager_cb(void (*func)(bContext *C, wmWindowManager *) ) +{ + free_windowmanager_cb= func; +} + /* used in headerbuttons.c image.c mesh.c screen.c sound.c and library.c */ void free_libblock(ListBase *lb, void *idv) { @@ -514,6 +528,10 @@ void free_libblock(ListBase *lb, void *idv) case ID_PA: psys_free_settings((ParticleSettings *)id); break; + case ID_WM: + if(free_windowmanager_cb) + free_windowmanager_cb(NULL, (wmWindowManager *)id); + break; } if (id->properties) { diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index e731f0fdfe0..420fea0a66d 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -285,6 +285,7 @@ int is_basis_mball(Object *ob) */ Object *find_basis_mball(Object *basis) { + extern ListBase editelems; /* editmball.c */ Base *base; Object *ob,*bob= basis; MetaElem *ml=NULL; @@ -1423,6 +1424,7 @@ void polygonize(PROCESS *mbproc, MetaBall *mb) float init_meta(Object *ob) /* return totsize */ { + extern ListBase editelems; /* editmball.c */ Base *base; Object *bob; MetaBall *mb; diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index fc8b14b8d4c..751415a73f3 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -101,6 +101,10 @@ #include "RE_shader_ext.h" +#include "BIF_meshlaplacian.h" +#include "BIF_space.h" +#include "mydevice.h" + /***/ static int noneModifier_isDisabled(ModifierData *md) diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index d0bf8b412ef..f6b4ba48b26 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -80,6 +80,7 @@ #include "BKE_cdderivedmesh.h" #include "blendef.h" +#include "BIF_editparticle.h" #include "RE_render_ext.h" static void key_from_object(Object *ob, ParticleKey *key); diff --git a/source/blender/blenkernel/intern/sca.c b/source/blender/blenkernel/intern/sca.c index e772a3bcdb4..f368a30afb3 100644 --- a/source/blender/blenkernel/intern/sca.c +++ b/source/blender/blenkernel/intern/sca.c @@ -40,7 +40,6 @@ #include <string.h> #include "MEM_guardedalloc.h" -#include "nla.h" /* For __NLA: Important, do not remove */ #include "DNA_text_types.h" #include "DNA_controller_types.h" #include "DNA_sensor_types.h" @@ -55,6 +54,8 @@ #include "BKE_blender.h" #include "BKE_sca.h" +#include "mydevice.h" + void free_text_controllers(Text *txt) { Object *ob; diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c index 5e8735147c3..c2035a19384 100644 --- a/source/blender/blenkernel/intern/screen.c +++ b/source/blender/blenkernel/intern/screen.c @@ -3,15 +3,12 @@ * * $Id$ * - * ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** + * ***** BEGIN GP 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. The Blender - * Foundation also sells licenses for use in proprietary software under - * the Blender License. See http://www.blender.org/BL/ for information - * about this. + * 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 @@ -29,7 +26,7 @@ * * Contributor(s): none yet. * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** + * ***** END GPL LICENSE BLOCK ***** */ #include <string.h> @@ -49,7 +46,7 @@ /* don't free screen itself */ void free_screen(bScreen *sc) { - unlink_screen(sc); + unlink_screen(sc); /* bad level call */ BLI_freelistN(&sc->vertbase); BLI_freelistN(&sc->edgebase); diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index d4a085ff8bd..e3b42a59784 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -699,7 +699,7 @@ void make_local_texture(Tex *tex) void autotexname(Tex *tex) { -/* extern char texstr[20][12]; *//* buttons.c, already in bad lev calls*/ + extern char texstr[20][12]; /* buttons.c */ Image *ima; char di[FILE_MAXDIR], fi[FILE_MAXFILE]; |