diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-04-06 18:45:50 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-04-06 18:45:50 +0400 |
commit | 4c16d3e2316f910b636fc63a20a385ea0dbf6436 (patch) | |
tree | 9323c5222004a8fdb206480a6c9d0f1526fad1dc /source/blender/blenloader/intern/readfile.c | |
parent | acfc0ea5111bcab5ea5795187d08b2f6ec5addaa (diff) | |
parent | 2ed2226ee753cc6a7a19806d99772efa61af897f (diff) |
Pre-merger changes.soc-2008-mxcurioni
Deprecated Freestyle-specific elements were removed from the code base,
in order to address all comments from branch code reviews.
https://codereview.appspot.com/7416049/
Backward compatibility won't be maintained in the following components:
- Freestyle edge/face marks in old .blend files are ignored.
Old .blend files can be converted by loading and saving the files using
a Freestyle branch build between revision 55581 and 55842.
- External style modules are no longer supported.
Instead text datablocks must be used to keep style module files within
.blend files. A branch build between revision 55741 and 55842 is useful
for identifying the style module file names that need reconfiguring.
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index c4f56b345a1..40e73892308 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9329,81 +9329,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main) linestyle->rounds = 3; } } - /* The code segment below will be removed when the trunk merger is done. - For now it is kept for backward compatibility, giving branch users time - to migrate to the new CustomData-based edge/face marks. */ - { - Scene *sce; - SceneRenderLayer *srl; - FreestyleModuleConfig *fmc; - Mesh *me; - MEdge *medge; - MPoly *mpoly; - int i, found; - - for (me = main->mesh.first; me; me = me->id.next) { - /* Freestyle edge marks */ - found = 0; - medge = me->medge; - for (i = 0; i < me->totedge; i++) { - if (medge->flag & ME_FREESTYLE_EDGE) { - found = 1; - break; - } - medge++; - } - if (found) { - FreestyleEdge *fed = CustomData_add_layer(&me->edata, CD_FREESTYLE_EDGE, CD_CALLOC, NULL, me->totedge); - medge = me->medge; - for (i = 0; i < me->totedge; i++) { - if (medge->flag & ME_FREESTYLE_EDGE) { - medge->flag &= ~ME_FREESTYLE_EDGE; - fed->flag |= FREESTYLE_EDGE_MARK; - } - medge++; - fed++; - } - printf("Migrated to CustomData-based Freestyle edge marks\n"); - } - /* Freestyle face marks */ - found = 0; - mpoly = me->mpoly; - for (i = 0; i < me->totpoly; i++) { - if (mpoly->flag & ME_FREESTYLE_FACE) { - found = 1; - break; - } - mpoly++; - } - if (found) { - FreestyleFace *ffa = CustomData_add_layer(&me->pdata, CD_FREESTYLE_FACE, CD_CALLOC, NULL, me->totpoly); - mpoly = me->mpoly; - for (i = 0; i < me->totpoly; i++) { - if (mpoly->flag & ME_FREESTYLE_FACE) { - mpoly->flag &= ~ME_FREESTYLE_FACE; - ffa->flag |= FREESTYLE_FACE_MARK; - } - mpoly++; - ffa++; - } - printf("Migrated to CustomData-based Freestyle face marks\n"); - } - } - for (sce = main->scene.first; sce; sce = sce->id.next) { - for (srl = sce->r.layers.first; srl; srl = srl->next) { - i = 1; - for (fmc = srl->freestyleConfig.modules.first; fmc; fmc = fmc->next) { - if (fmc->module_path[0] != '\0' && !fmc->script) { - fprintf(stderr, "The external style module below needs to be reconfigured using text datablock:\n"); - fprintf(stderr, " %s\n", fmc->module_path); - fprintf(stderr, " in scene \"%s\", render layer \"%s\", style module #%d (%s)\n", - sce->id.name+2, srl->name, i, (fmc->is_displayed) ? "enabled" : "disabled"); - } - i++; - } - } - } - } /* WATCH IT!!!: pointers from libdata have not been converted yet here! */ /* WATCH IT 2!: Userdef struct init see do_versions_userdef() above! */ |