From 3abe8b3292cf7a50a9200b95401993384df24d9a Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Wed, 22 Nov 2017 10:52:39 -0200 Subject: Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927 --- source/blender/blenkernel/intern/collection.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'source/blender/blenkernel/intern/collection.c') diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index 2a1157cf6b4..25305b1d25a 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -117,12 +117,12 @@ static bool collection_remlink(SceneCollection *sc_parent, SceneCollection *sc_g /** * Recursively remove any instance of this SceneCollection */ -static void layer_collection_remove(SceneLayer *sl, ListBase *lb, const SceneCollection *sc) +static void layer_collection_remove(ViewLayer *view_layer, ListBase *lb, const SceneCollection *sc) { LayerCollection *lc = lb->first; while (lc) { if (lc->scene_collection == sc) { - BKE_layer_collection_free(sl, lc); + BKE_layer_collection_free(view_layer, lc); BLI_remlink(lb, lc); LayerCollection *lc_next = lc->next; @@ -132,13 +132,13 @@ static void layer_collection_remove(SceneLayer *sl, ListBase *lb, const SceneCol /* only the "top-level" layer collections may have the * same SceneCollection in a sibling tree. */ - if (lb != &sl->layer_collections) { + if (lb != &view_layer->layer_collections) { return; } } else { - layer_collection_remove(sl, &lc->layer_collections, sc); + layer_collection_remove(view_layer, &lc->layer_collections, sc); lc = lc->next; } } @@ -165,9 +165,9 @@ bool BKE_collection_remove(Scene *scene, SceneCollection *sc) collection_free(sc, true); /* check all layers that use this collection and clear them */ - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { - layer_collection_remove(sl, &sl->layer_collections, sc); - sl->active_collection = 0; + for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { + layer_collection_remove(view_layer, &view_layer->layer_collections, sc); + view_layer->active_collection = 0; } MEM_freeN(sc); @@ -258,13 +258,13 @@ void BKE_collection_object_add_from(Scene *scene, Object *ob_src, Object *ob_dst } FOREACH_SCENE_COLLECTION_END - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { - Base *base_src = BKE_scene_layer_base_find(sl, ob_src); + for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { + Base *base_src = BKE_view_layer_base_find(view_layer, ob_src); if (base_src != NULL) { if (base_src->collection_properties == NULL) { continue; } - Base *base_dst = BKE_scene_layer_base_find(sl, ob_dst); + Base *base_dst = BKE_view_layer_base_find(view_layer, ob_dst); IDP_MergeGroup(base_dst->collection_properties, base_src->collection_properties, true); } } -- cgit v1.2.3