diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-10-22 17:20:01 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-10-22 17:20:01 +0300 |
| commit | e6c943c9176d2bcf40bd40c9b0212df4f87858b5 (patch) | |
| tree | 79b697364f3f14ff95229c2a82a9922a175bc55d /source/blender/blenkernel/intern | |
| parent | e7cd64dc971286f2430be9ad652a3031f91068a2 (diff) | |
Cleanup: remove script ID-types
Unused since 2.4x and unlikely to be reintroduced as ID-types.
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/blender.c | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/library.c | 16 |
2 files changed, 0 insertions, 17 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index f1300697b85..fc76c298802 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -256,7 +256,6 @@ static void setup_app_data(bContext *C, BlendFileData *bfd, const char *filepath /* comes from readfile.c */ SWAP(ListBase, G.main->wm, bfd->main->wm); SWAP(ListBase, G.main->screen, bfd->main->screen); - SWAP(ListBase, G.main->script, bfd->main->script); /* we re-use current screen */ curscreen = CTX_wm_screen(C); diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index f8f92825479..d9439b53639 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -264,8 +264,6 @@ bool id_make_local(ID *id, bool test) return false; /* not implemented */ case ID_TXT: return false; /* not implemented */ - case ID_SCRIPT: - return false; /* deprecated */ case ID_SO: return false; /* not implemented */ case ID_GR: @@ -360,8 +358,6 @@ bool id_copy(ID *id, ID **newid, bool test) case ID_TXT: if (!test) *newid = (ID *)BKE_text_copy(G.main, (Text *)id); return true; - case ID_SCRIPT: - return false; /* deprecated */ case ID_SO: return false; /* not implemented */ case ID_GR: @@ -496,8 +492,6 @@ ListBase *which_libbase(Main *mainlib, short type) return &(mainlib->vfont); case ID_TXT: return &(mainlib->text); - case ID_SCRIPT: - return &(mainlib->script); case ID_SPK: return &(mainlib->speaker); case ID_SO: @@ -614,7 +608,6 @@ int set_listbasepointers(Main *main, ListBase **lb) lb[a++] = &(main->palettes); lb[a++] = &(main->paintcurves); lb[a++] = &(main->brush); - lb[a++] = &(main->script); lb[a++] = &(main->particle); lb[a++] = &(main->speaker); @@ -708,9 +701,6 @@ void *BKE_libblock_alloc_notest(short type) case ID_TXT: id = MEM_callocN(sizeof(Text), "text"); break; - case ID_SCRIPT: - //XXX id = MEM_callocN(sizeof(Script), "script"); - break; case ID_SPK: id = MEM_callocN(sizeof(Speaker), "speaker"); break; @@ -858,9 +848,6 @@ void BKE_libblock_init_empty(ID *id) case ID_TXT: BKE_text_init((Text *)id); break; - case ID_SCRIPT: - BLI_assert(0); - break; case ID_SO: /* Another fuzzy case, think NULLified content is OK here... */ break; @@ -1135,9 +1122,6 @@ void BKE_libblock_free_ex(Main *bmain, void *idv, bool do_id_user) case ID_TXT: BKE_text_free((Text *)id); break; - case ID_SCRIPT: - /* deprecated */ - break; case ID_SPK: BKE_speaker_free((Speaker *)id); break; |