diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-14 21:32:13 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-22 12:13:33 +0300 |
| commit | f15c63b0c2216fdebe559a0ed0f93765e6e763dc (patch) | |
| tree | 60426da70bb7973c90e1733683ea0c6f4c7cd9cc /source/blender/blenloader | |
| parent | 9ce2370ce4f1e1e9bf14feaf56eee82bec9474ff (diff) | |
SceneRenderLayer > SceneLayer: Remove light_override
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 7c08b909920..4dbc93bc20b 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5916,7 +5916,6 @@ static void lib_link_scene(FileData *fd, Main *main) for (SceneRenderLayer *srl = sce->r.layers.first; srl; srl = srl->next) { srl->mat_override = newlibadr_us(fd, sce->id.lib, srl->mat_override); - srl->light_override = newlibadr_us(fd, sce->id.lib, srl->light_override); for (FreestyleModuleConfig *fmc = srl->freestyleConfig.modules.first; fmc; fmc = fmc->next) { fmc->script = newlibadr(fd, sce->id.lib, fmc->script); } @@ -9801,7 +9800,6 @@ static void expand_scene(FileData *fd, Main *mainvar, Scene *sce) for (srl = sce->r.layers.first; srl; srl = srl->next) { expand_doit(fd, mainvar, srl->mat_override); - expand_doit(fd, mainvar, srl->light_override); for (module = srl->freestyleConfig.modules.first; module; module = module->next) { if (module->script) expand_doit(fd, mainvar, module->script); diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 31b90254916..9b06a79f651 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -310,11 +310,6 @@ void do_versions_after_linking_280(Main *main) BKE_collection_override_datablock_add((LayerCollection *)scene_layer->layer_collections.first, "material", (ID *)srl->mat_override); } - if (srl->light_override && BKE_scene_uses_blender_internal(scene)) { - /* not sure how we handle this, pending until we design the override system */ - TODO_LAYER_OVERRIDE; - } - if (srl->lay != scene->lay) { /* unlink master collection */ BKE_collection_unlink(scene_layer, scene_layer->layer_collections.first); |