diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-22 15:52:39 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-23 12:48:23 +0300 |
| commit | 3abe8b3292cf7a50a9200b95401993384df24d9a (patch) | |
| tree | 6c7a853710f1a4264dd1bb4d7b9bf14f44b75f33 /source/blender/blenkernel/intern | |
| parent | fb7d23bdb2a5c0ed00067045e4acdf6593258b52 (diff) | |
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
Diffstat (limited to 'source/blender/blenkernel/intern')
26 files changed, 341 insertions, 341 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index f5da88f57f3..60d62b0b39d 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -2707,7 +2707,7 @@ static void editbmesh_build_data( static CustomDataMask object_get_datamask(const Scene *scene, Object *ob, bool *r_need_mapping) { /* TODO(sergey): Avoid this linear list lookup. */ - SceneLayer *sl = BKE_scene_layer_context_active_PLACEHOLDER(scene); + ViewLayer *sl = BKE_view_layer_context_active_PLACEHOLDER(scene); Object *actob = sl->basact ? sl->basact->object : NULL; CustomDataMask mask = ob->customdata_mask; diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index 7a0bf54f1f2..62df97c6afa 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -279,7 +279,7 @@ void animviz_get_object_motionpaths(Object *ob, ListBase *targets) /* update scene for current frame */ static void motionpaths_calc_update_scene(Main *bmain, Scene *scene, - SceneLayer *scene_layer, + ViewLayer *view_layer, struct Depsgraph *depsgraph) { /* Do all updates @@ -292,7 +292,7 @@ static void motionpaths_calc_update_scene(Main *bmain, * * TODO(sergey): Use evaluation context dedicated to motion paths. */ - BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, scene_layer); + BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, view_layer); } /* ........ */ @@ -369,7 +369,7 @@ static void motionpaths_calc_bake_targets(Scene *scene, ListBase *targets) /* calculate path over requested range */ for (CFRA = sfra; CFRA <= efra; CFRA++) { /* update relevant data for new frame */ - motionpaths_calc_update_scene(bmain, scene, eval_ctx->scene_layer, eval_ctx->depsgraph); + motionpaths_calc_update_scene(bmain, scene, eval_ctx->view_layer, eval_ctx->depsgraph); /* perform baking for targets */ motionpaths_calc_bake_targets(scene, targets); @@ -377,7 +377,7 @@ static void motionpaths_calc_bake_targets(Scene *scene, ListBase *targets) /* reset original environment */ CFRA = cfra; - motionpaths_calc_update_scene(bmain, scene, eval_ctx->scene_layer, eval_ctx->depsgraph); + motionpaths_calc_update_scene(bmain, scene, eval_ctx->view_layer, eval_ctx->depsgraph); /* clear recalc flags from targets */ for (mpt = targets->first; mpt; mpt = mpt->next) { diff --git a/source/blender/blenkernel/intern/blender_copybuffer.c b/source/blender/blenkernel/intern/blender_copybuffer.c index f249765e016..b0c571bf159 100644 --- a/source/blender/blenkernel/intern/blender_copybuffer.c +++ b/source/blender/blenkernel/intern/blender_copybuffer.c @@ -120,7 +120,7 @@ bool BKE_copybuffer_paste(bContext *C, const char *libname, const short flag, Re { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); Main *mainl = NULL; Library *lib; BlendHandle *bh; @@ -132,7 +132,7 @@ bool BKE_copybuffer_paste(bContext *C, const char *libname, const short flag, Re return false; } - BKE_scene_layer_base_deselect_all(scene_layer); + BKE_view_layer_base_deselect_all(view_layer); /* tag everything, all untagged data can be made local * its also generally useful to know what is new @@ -145,7 +145,7 @@ bool BKE_copybuffer_paste(bContext *C, const char *libname, const short flag, Re BLO_library_link_copypaste(mainl, bh); - BLO_library_link_end(mainl, &bh, flag, scene, scene_layer); + BLO_library_link_end(mainl, &bh, flag, scene, view_layer); /* mark all library linked objects to be updated */ BKE_main_lib_objects_recalc_all(bmain); diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c index f6dfb7f922c..8d61b6723c6 100644 --- a/source/blender/blenkernel/intern/blendfile.c +++ b/source/blender/blenkernel/intern/blendfile.c @@ -168,7 +168,7 @@ static void setup_app_data( */ wmWindow *win; bScreen *curscreen = NULL; - SceneLayer *cur_render_layer; + ViewLayer *cur_view_layer; bool track_undo_scene; /* comes from readfile.c */ @@ -181,7 +181,7 @@ static void setup_app_data( curscreen = CTX_wm_screen(C); /* but use Scene pointer from new file */ curscene = bfd->curscene; - cur_render_layer = bfd->cur_render_layer; + cur_view_layer = bfd->cur_view_layer; track_undo_scene = (mode == LOAD_UNDO && curscreen && curscene && bfd->main->wm.first); @@ -192,9 +192,9 @@ static void setup_app_data( if (curscene == NULL) { curscene = BKE_scene_add(bfd->main, "Empty"); } - if (cur_render_layer == NULL) { + if (cur_view_layer == NULL) { /* fallback to scene layer */ - cur_render_layer = BKE_scene_layer_from_scene_get(curscene); + cur_view_layer = BKE_view_layer_from_scene_get(curscene); } if (track_undo_scene) { @@ -207,7 +207,7 @@ static void setup_app_data( } /* BKE_blender_globals_clear will free G.main, here we can still restore pointers */ - blo_lib_link_restore(bfd->main, CTX_wm_manager(C), curscene, cur_render_layer); + blo_lib_link_restore(bfd->main, CTX_wm_manager(C), curscene, cur_view_layer); if (win) { curscene = win->scene; } diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index d9280a84678..e222c189ddb 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -666,7 +666,7 @@ static bool camera_frame_fit_calc_from_data( /* don't move the camera, just yield the fit location */ /* r_scale only valid/useful for ortho cameras */ bool BKE_camera_view_frame_fit_to_scene( - Scene *scene, SceneLayer *sl, Object *camera_ob, float r_co[3], float *r_scale) + Scene *scene, ViewLayer *sl, Object *camera_ob, float r_co[3], float *r_scale) { CameraParams params; CameraViewFrameData data_cb; 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); } } diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index 0bd79a50673..216c1f3adc4 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -921,15 +921,15 @@ Scene *CTX_data_scene(const bContext *C) return C->data.scene; } -SceneLayer *CTX_data_scene_layer(const bContext *C) +ViewLayer *CTX_data_view_layer(const bContext *C) { - SceneLayer *sl; + ViewLayer *sl; - if (ctx_data_pointer_verify(C, "render_layer", (void *)&sl)) { + if (ctx_data_pointer_verify(C, "view_layer", (void *)&sl)) { return sl; } else { - return BKE_scene_layer_from_workspace_get(CTX_data_scene(C), CTX_wm_workspace(C)); + return BKE_view_layer_from_workspace_get(CTX_data_scene(C), CTX_wm_workspace(C)); } } @@ -957,16 +957,16 @@ RenderEngineType *CTX_data_engine(const bContext *C) * This is tricky. Sometimes the user overrides the render_layer * but not the scene_collection. In this case what to do? * - * If the scene_collection is linked to the SceneLayer we use it. - * Otherwise we fallback to the active one of the SceneLayer. + * If the scene_collection is linked to the ViewLayer we use it. + * Otherwise we fallback to the active one of the ViewLayer. */ LayerCollection *CTX_data_layer_collection(const bContext *C) { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); LayerCollection *lc; if (ctx_data_pointer_verify(C, "layer_collection", (void *)&lc)) { - if (BKE_scene_layer_has_collection(sl, lc->scene_collection)) { + if (BKE_view_layer_has_collection(sl, lc->scene_collection)) { return lc; } } @@ -979,7 +979,7 @@ SceneCollection *CTX_data_scene_collection(const bContext *C) { SceneCollection *sc; if (ctx_data_pointer_verify(C, "scene_collection", (void *)&sc)) { - if (BKE_scene_layer_has_collection(CTX_data_scene_layer(C), sc)) { + if (BKE_view_layer_has_collection(CTX_data_view_layer(C), sc)) { return sc; } } @@ -1259,8 +1259,8 @@ int CTX_data_editable_gpencil_strokes(const bContext *C, ListBase *list) Depsgraph *CTX_data_depsgraph(const bContext *C) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); - return BKE_scene_get_depsgraph(scene, scene_layer, true); + ViewLayer *view_layer = CTX_data_view_layer(C); + return BKE_scene_get_depsgraph(scene, view_layer, true); } void CTX_data_eval_ctx(const bContext *C, EvaluationContext *eval_ctx) @@ -1268,9 +1268,9 @@ void CTX_data_eval_ctx(const bContext *C, EvaluationContext *eval_ctx) BLI_assert(C != NULL); Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); RenderEngineType *engine = CTX_data_engine(C); DEG_evaluation_context_init_from_scene(eval_ctx, - scene, scene_layer, engine, + scene, view_layer, engine, DAG_EVAL_VIEWPORT); } diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 728167efa04..394075c1792 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -488,7 +488,7 @@ static void scene_setSubframe(Scene *scene, float subframe) scene->r.subframe = subframe; } -static int surface_getBrushFlags(DynamicPaintSurface *surface, const SceneLayer *sl) +static int surface_getBrushFlags(DynamicPaintSurface *surface, const ViewLayer *sl) { Base *base = NULL; GroupObject *go = NULL; @@ -5639,7 +5639,7 @@ static void dynamic_paint_generate_bake_data_cb(void *userdata, const int index) } } -static int dynamicPaint_generateBakeData(DynamicPaintSurface *surface, const SceneLayer *sl, Object *ob) +static int dynamicPaint_generateBakeData(DynamicPaintSurface *surface, const ViewLayer *sl, Object *ob) { PaintSurfaceData *sData = surface->data; PaintBakeData *bData = sData->bData; @@ -5783,7 +5783,7 @@ static int dynamicPaint_doStep(const struct EvaluationContext *eval_ctx, Scene * GroupObject *go = NULL; Object *brushObj = NULL; ModifierData *md = NULL; - SceneLayer *sl = eval_ctx->scene_layer; + ViewLayer *sl = eval_ctx->view_layer; /* backup current scene frame */ int scene_frame = scene->r.cfra; @@ -5941,7 +5941,7 @@ int dynamicPaint_calculateFrame( dynamicPaint_applySurfaceDisplace(surface, surface->canvas->dm); /* update bake data */ - dynamicPaint_generateBakeData(surface, eval_ctx->scene_layer, cObject); + dynamicPaint_generateBakeData(surface, eval_ctx->view_layer, cObject); /* don't do substeps for first frame */ if (surface->substeps && (frame != surface->start_frame)) { diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index ce3e7dbf931..76132b02716 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -213,17 +213,17 @@ ListBase *pdInitEffectors( const struct EvaluationContext *eval_ctx, Scene *scene, Object *ob_src, ParticleSystem *psys_src, EffectorWeights *weights, bool for_simulation) { - SceneLayer *sl; + ViewLayer *sl; Base *base; unsigned int layer= ob_src->lay; ListBase *effectors = NULL; /* eval_ctx is NULL during deg build */ if (eval_ctx) { - sl = eval_ctx->scene_layer; + sl = eval_ctx->view_layer; } else { - sl = BKE_scene_layer_context_active_PLACEHOLDER(scene); + sl = BKE_view_layer_context_active_PLACEHOLDER(scene); } if (weights->group) { diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index 39938f819ef..5e07ad02a07 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -57,9 +57,9 @@ /* prototype */ struct EngineSettingsCB_Type; -static void layer_collection_free(SceneLayer *sl, LayerCollection *lc); -static void layer_collection_objects_populate(SceneLayer *sl, LayerCollection *lc, ListBase *objects); -static LayerCollection *layer_collection_add(SceneLayer *sl, LayerCollection *parent, SceneCollection *sc); +static void layer_collection_free(ViewLayer *sl, LayerCollection *lc); +static void layer_collection_objects_populate(ViewLayer *sl, LayerCollection *lc, ListBase *objects); +static LayerCollection *layer_collection_add(ViewLayer *sl, LayerCollection *parent, SceneCollection *sc); static LayerCollection *find_layer_collection_by_scene_collection(LayerCollection *lc, const SceneCollection *sc); static IDProperty *collection_engine_settings_create(struct EngineSettingsCB_Type *ces_type, const bool populate); static IDProperty *collection_engine_get(IDProperty *root, const int type, const char *engine_name); @@ -70,60 +70,60 @@ static void object_bases_iterator_next(BLI_Iterator *iter, const int flag); /* RenderLayer */ /** - * Returns the SceneLayer to be used for rendering - * Most of the time BKE_scene_layer_from_workspace_get should be used instead + * Returns the ViewLayer to be used for rendering + * Most of the time BKE_view_layer_from_workspace_get should be used instead */ -SceneLayer *BKE_scene_layer_from_scene_get(const Scene *scene) +ViewLayer *BKE_view_layer_from_scene_get(const Scene *scene) { - SceneLayer *sl = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *sl = BLI_findlink(&scene->view_layers, scene->active_view_layer); BLI_assert(sl); return sl; } /** - * Returns the SceneLayer to be used for drawing, outliner, and other context related areas. + * Returns the ViewLayer to be used for drawing, outliner, and other context related areas. */ -SceneLayer *BKE_scene_layer_from_workspace_get(const struct Scene *scene, const struct WorkSpace *workspace) +ViewLayer *BKE_view_layer_from_workspace_get(const struct Scene *scene, const struct WorkSpace *workspace) { if (BKE_workspace_use_scene_settings_get(workspace)) { - return BKE_scene_layer_from_scene_get(scene); + return BKE_view_layer_from_scene_get(scene); } else { - return BKE_workspace_render_layer_get(workspace); + return BKE_workspace_view_layer_get(workspace); } } /** * This is a placeholder to know which areas of the code need to be addressed for the Workspace changes. - * Never use this, you should either use BKE_scene_layer_workspace_active or get SceneLayer explicitly. + * Never use this, you should either use BKE_view_layer_workspace_active or get ViewLayer explicitly. */ -SceneLayer *BKE_scene_layer_context_active_PLACEHOLDER(const Scene *scene) +ViewLayer *BKE_view_layer_context_active_PLACEHOLDER(const Scene *scene) { - return BKE_scene_layer_from_scene_get(scene); + return BKE_view_layer_from_scene_get(scene); } /** * Add a new renderlayer * by default, a renderlayer has the master collection */ -SceneLayer *BKE_scene_layer_add(Scene *scene, const char *name) +ViewLayer *BKE_view_layer_add(Scene *scene, const char *name) { if (!name) { name = DATA_("Render Layer"); } IDPropertyTemplate val = {0}; - SceneLayer *sl = MEM_callocN(sizeof(SceneLayer), "Scene Layer"); - sl->flag = SCENE_LAYER_RENDER | SCENE_LAYER_FREESTYLE; + ViewLayer *sl = MEM_callocN(sizeof(ViewLayer), "Scene Layer"); + sl->flag = VIEW_LAYER_RENDER | VIEW_LAYER_FREESTYLE; sl->properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); layer_engine_settings_init(sl->properties, false); - BLI_addtail(&scene->render_layers, sl); + BLI_addtail(&scene->view_layers, sl); /* unique name */ BLI_strncpy_utf8(sl->name, name, sizeof(sl->name)); - BLI_uniquename(&scene->render_layers, sl, DATA_("SceneLayer"), '.', offsetof(SceneLayer, name), sizeof(sl->name)); + BLI_uniquename(&scene->view_layers, sl, DATA_("ViewLayer"), '.', offsetof(ViewLayer, name), sizeof(sl->name)); SceneCollection *sc = BKE_collection_master(scene); layer_collection_add(sl, NULL, sc); @@ -138,9 +138,9 @@ SceneLayer *BKE_scene_layer_add(Scene *scene, const char *name) } /** - * Free (or release) any data used by this SceneLayer. + * Free (or release) any data used by this ViewLayer. */ -void BKE_scene_layer_free(SceneLayer *sl) +void BKE_view_layer_free(ViewLayer *sl) { sl->basact = NULL; @@ -167,7 +167,7 @@ void BKE_scene_layer_free(SceneLayer *sl) MEM_freeN(sl->properties_evaluated); } - for (SceneLayerEngineData *sled = sl->drawdata.first; sled; sled = sled->next) { + for (ViewLayerEngineData *sled = sl->drawdata.first; sled; sled = sled->next) { if (sled->storage) { if (sled->free) { sled->free(sled->storage); @@ -192,7 +192,7 @@ void BKE_scene_layer_free(SceneLayer *sl) /** * Tag all the selected objects of a renderlayer */ -void BKE_scene_layer_selected_objects_tag(SceneLayer *sl, const int tag) +void BKE_view_layer_selected_objects_tag(ViewLayer *sl, const int tag) { for (Base *base = sl->object_bases.first; base; base = base->next) { if ((base->flag & BASE_SELECTED) != 0) { @@ -220,13 +220,13 @@ static bool find_scene_collection_in_scene_collections(ListBase *lb, const Layer /** * Fallback for when a Scene has no camera to use * - * \param scene_layer: in general you want to use the same SceneLayer that is used + * \param view_layer: in general you want to use the same ViewLayer that is used * for depsgraph. If rendering you pass the scene active layer, when viewing in the viewport - * you want to get SceneLayer from context. + * you want to get ViewLayer from context. */ -Object *BKE_scene_layer_camera_find(SceneLayer *scene_layer) +Object *BKE_view_layer_camera_find(ViewLayer *view_layer) { - for (Base *base = scene_layer->object_bases.first; base; base = base->next) { + for (Base *base = view_layer->object_bases.first; base; base = base->next) { if (base->object->type == OB_CAMERA) { return base->object; } @@ -236,11 +236,11 @@ Object *BKE_scene_layer_camera_find(SceneLayer *scene_layer) } /** - * Find the SceneLayer a LayerCollection belongs to + * Find the ViewLayer a LayerCollection belongs to */ -SceneLayer *BKE_scene_layer_find_from_collection(const Scene *scene, LayerCollection *lc) +ViewLayer *BKE_view_layer_find_from_collection(const Scene *scene, LayerCollection *lc) { - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { if (find_scene_collection_in_scene_collections(&sl->layer_collections, lc)) { return sl; } @@ -250,12 +250,12 @@ SceneLayer *BKE_scene_layer_find_from_collection(const Scene *scene, LayerCollec /* Base */ -Base *BKE_scene_layer_base_find(SceneLayer *sl, Object *ob) +Base *BKE_view_layer_base_find(ViewLayer *sl, Object *ob) { return BLI_findptr(&sl->object_bases, ob, offsetof(Base, object)); } -void BKE_scene_layer_base_deselect_all(SceneLayer *sl) +void BKE_view_layer_base_deselect_all(ViewLayer *sl) { Base *base; @@ -264,7 +264,7 @@ void BKE_scene_layer_base_deselect_all(SceneLayer *sl) } } -void BKE_scene_layer_base_select(struct SceneLayer *sl, Base *selbase) +void BKE_view_layer_base_select(struct ViewLayer *sl, Base *selbase) { sl->basact = selbase; if ((selbase->flag & BASE_SELECTABLED) != 0) { @@ -272,7 +272,7 @@ void BKE_scene_layer_base_select(struct SceneLayer *sl, Base *selbase) } } -static void scene_layer_object_base_unref(SceneLayer *sl, Base *base) +static void view_layer_object_base_unref(ViewLayer *sl, Base *base) { base->refcount--; @@ -296,10 +296,10 @@ static void scene_layer_object_base_unref(SceneLayer *sl, Base *base) * Return the base if existent, or create it if necessary * Always bump the refcount */ -static Base *object_base_add(SceneLayer *sl, Object *ob) +static Base *object_base_add(ViewLayer *sl, Object *ob) { Base *base; - base = BKE_scene_layer_base_find(sl, ob); + base = BKE_view_layer_base_find(sl, ob); if (base == NULL) { base = MEM_callocN(sizeof(Base), "Object Base"); @@ -318,11 +318,11 @@ static Base *object_base_add(SceneLayer *sl, Object *ob) /* LayerCollection */ -static void layer_collection_objects_unpopulate(SceneLayer *sl, LayerCollection *lc) +static void layer_collection_objects_unpopulate(ViewLayer *sl, LayerCollection *lc) { if (sl) { for (LinkData *link = lc->object_bases.first; link; link = link->next) { - scene_layer_object_base_unref(sl, link->data); + view_layer_object_base_unref(sl, link->data); } } @@ -330,10 +330,10 @@ static void layer_collection_objects_unpopulate(SceneLayer *sl, LayerCollection } /** - * When freeing the entire SceneLayer at once we don't bother with unref - * otherwise SceneLayer is passed to keep the syncing of the LayerCollection tree + * When freeing the entire ViewLayer at once we don't bother with unref + * otherwise ViewLayer is passed to keep the syncing of the LayerCollection tree */ -static void layer_collection_free(SceneLayer *sl, LayerCollection *lc) +static void layer_collection_free(ViewLayer *sl, LayerCollection *lc) { layer_collection_objects_unpopulate(sl, lc); BLI_freelistN(&lc->overrides); @@ -356,10 +356,10 @@ static void layer_collection_free(SceneLayer *sl, LayerCollection *lc) } /** - * Free (or release) LayerCollection from SceneLayer + * Free (or release) LayerCollection from ViewLayer * (does not free the LayerCollection itself). */ -void BKE_layer_collection_free(SceneLayer *sl, LayerCollection *lc) +void BKE_layer_collection_free(ViewLayer *sl, LayerCollection *lc) { layer_collection_free(sl, lc); } @@ -389,7 +389,7 @@ static LayerCollection *collection_from_index(ListBase *lb, const int number, in /** * Get the collection for a given index */ -LayerCollection *BKE_layer_collection_from_index(SceneLayer *sl, const int index) +LayerCollection *BKE_layer_collection_from_index(ViewLayer *sl, const int index) { int i = 0; return collection_from_index(&sl->layer_collections, index, &i); @@ -398,7 +398,7 @@ LayerCollection *BKE_layer_collection_from_index(SceneLayer *sl, const int index /** * Get the active collection */ -LayerCollection *BKE_layer_collection_get_active(SceneLayer *sl) +LayerCollection *BKE_layer_collection_get_active(ViewLayer *sl) { int i = 0; return collection_from_index(&sl->layer_collections, sl->active_collection, &i); @@ -409,13 +409,13 @@ LayerCollection *BKE_layer_collection_get_active(SceneLayer *sl) * Return layer collection to add new object(s). * Create one if none exists. */ -LayerCollection *BKE_layer_collection_get_active_ensure(Scene *scene, SceneLayer *sl) +LayerCollection *BKE_layer_collection_get_active_ensure(Scene *scene, ViewLayer *sl) { LayerCollection *lc = BKE_layer_collection_get_active(sl); if (lc == NULL) { BLI_assert(BLI_listbase_is_empty(&sl->layer_collections)); - /* When there is no collection linked to this SceneLayer, create one. */ + /* When there is no collection linked to this ViewLayer, create one. */ SceneCollection *sc = BKE_collection_add(scene, NULL, NULL); lc = BKE_collection_link(sl, sc); /* New collection has to be the active one. */ @@ -441,7 +441,7 @@ static int collection_count(ListBase *lb) * Get the total number of collections * (including all the nested collections) */ -int BKE_layer_collection_count(SceneLayer *sl) +int BKE_layer_collection_count(ViewLayer *sl) { return collection_count(&sl->layer_collections); } @@ -469,7 +469,7 @@ static int index_from_collection(ListBase *lb, const LayerCollection *lc, int *i /** * Return -1 if not found */ -int BKE_layer_collection_findindex(SceneLayer *sl, const LayerCollection *lc) +int BKE_layer_collection_findindex(ViewLayer *sl, const LayerCollection *lc) { int i = 0; return index_from_collection(&sl->layer_collections, lc, &i); @@ -520,13 +520,13 @@ static ListBase *scene_collection_listbase_find(ListBase *lb, SceneCollection *s /** * Nest a LayerCollection into another one - * Both collections must be from the same SceneLayer, return true if succeded. + * Both collections must be from the same ViewLayer, return true if succeded. * * The LayerCollection will effectively be moved into the * new (nested) position. So all the settings, overrides, ... go with it, and - * if the collection was directly linked to the SceneLayer it's then unlinked. + * if the collection was directly linked to the ViewLayer it's then unlinked. * - * For the other SceneLayers we simply resync the tree, without changing directly + * For the other ViewLayers we simply resync the tree, without changing directly * linked collections (even if they link to the same SceneCollection) * * \param lc_src LayerCollection to nest into \a lc_dst @@ -534,7 +534,7 @@ static ListBase *scene_collection_listbase_find(ListBase *lb, SceneCollection *s */ static void layer_collection_swap( - SceneLayer *sl, ListBase *lb_a, ListBase *lb_b, + ViewLayer *sl, ListBase *lb_a, ListBase *lb_b, LayerCollection *lc_a, LayerCollection *lc_b) { if (lb_a == NULL) { @@ -553,14 +553,14 @@ static void layer_collection_swap( /** * Move \a lc_src into \a lc_dst. Both have to be stored in \a sl. - * If \a lc_src is directly linked to the SceneLayer it's unlinked + * If \a lc_src is directly linked to the ViewLayer it's unlinked */ bool BKE_layer_collection_move_into(const Scene *scene, LayerCollection *lc_dst, LayerCollection *lc_src) { - SceneLayer *sl = BKE_scene_layer_find_from_collection(scene, lc_src); + ViewLayer *sl = BKE_view_layer_find_from_collection(scene, lc_src); bool is_directly_linked = false; - if ((!sl) || (sl != BKE_scene_layer_find_from_collection(scene, lc_dst))) { + if ((!sl) || (sl != BKE_view_layer_find_from_collection(scene, lc_dst))) { return false; } @@ -620,15 +620,15 @@ bool BKE_layer_collection_move_into(const Scene *scene, LayerCollection *lc_dst, /** * Move \a lc_src above \a lc_dst. Both have to be stored in \a sl. - * If \a lc_src is directly linked to the SceneLayer it's unlinked + * If \a lc_src is directly linked to the ViewLayer it's unlinked */ bool BKE_layer_collection_move_above(const Scene *scene, LayerCollection *lc_dst, LayerCollection *lc_src) { - SceneLayer *sl = BKE_scene_layer_find_from_collection(scene, lc_src); + ViewLayer *sl = BKE_view_layer_find_from_collection(scene, lc_src); const bool is_directly_linked_src = BLI_findindex(&sl->layer_collections, lc_src) != -1; const bool is_directly_linked_dst = BLI_findindex(&sl->layer_collections, lc_dst) != -1; - if ((!sl) || (sl != BKE_scene_layer_find_from_collection(scene, lc_dst))) { + if ((!sl) || (sl != BKE_view_layer_find_from_collection(scene, lc_dst))) { return false; } @@ -651,7 +651,7 @@ bool BKE_layer_collection_move_above(const Scene *scene, LayerCollection *lc_dst /* We don't allow to move above/below a directly linked collection * unless the source collection is also directly linked */ else if (is_directly_linked_dst) { - /* Both directly linked to the SceneLayer, just need to swap */ + /* Both directly linked to the ViewLayer, just need to swap */ if (is_directly_linked_src) { BLI_remlink(&sl->layer_collections, lc_src); BLI_insertlinkbefore(&sl->layer_collections, lc_dst, lc_src); @@ -695,15 +695,15 @@ bool BKE_layer_collection_move_above(const Scene *scene, LayerCollection *lc_dst /** * Move \a lc_src below \a lc_dst. Both have to be stored in \a sl. - * If \a lc_src is directly linked to the SceneLayer it's unlinked + * If \a lc_src is directly linked to the ViewLayer it's unlinked */ bool BKE_layer_collection_move_below(const Scene *scene, LayerCollection *lc_dst, LayerCollection *lc_src) { - SceneLayer *sl = BKE_scene_layer_find_from_collection(scene, lc_src); + ViewLayer *sl = BKE_view_layer_find_from_collection(scene, lc_src); const bool is_directly_linked_src = BLI_findindex(&sl->layer_collections, lc_src) != -1; const bool is_directly_linked_dst = BLI_findindex(&sl->layer_collections, lc_dst) != -1; - if ((!sl) || (sl != BKE_scene_layer_find_from_collection(scene, lc_dst))) { + if ((!sl) || (sl != BKE_view_layer_find_from_collection(scene, lc_dst))) { return false; } @@ -726,7 +726,7 @@ bool BKE_layer_collection_move_below(const Scene *scene, LayerCollection *lc_dst /* We don't allow to move above/below a directly linked collection * unless the source collection is also directly linked */ else if (is_directly_linked_dst) { - /* Both directly linked to the SceneLayer, just need to swap */ + /* Both directly linked to the ViewLayer, just need to swap */ if (is_directly_linked_src) { BLI_remlink(&sl->layer_collections, lc_src); BLI_insertlinkafter(&sl->layer_collections, lc_dst, lc_src); @@ -768,7 +768,7 @@ bool BKE_layer_collection_move_below(const Scene *scene, LayerCollection *lc_dst return true; } -static bool layer_collection_resync(SceneLayer *sl, LayerCollection *lc, const SceneCollection *sc) +static bool layer_collection_resync(ViewLayer *sl, LayerCollection *lc, const SceneCollection *sc) { if (lc->scene_collection == sc) { ListBase collections = {NULL}; @@ -811,7 +811,7 @@ static bool layer_collection_resync(SceneLayer *sl, LayerCollection *lc, const S */ void BKE_layer_collection_resync(const Scene *scene, const SceneCollection *sc) { - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) { layer_collection_resync(sl, lc, sc); } @@ -824,7 +824,7 @@ void BKE_layer_collection_resync(const Scene *scene, const SceneCollection *sc) * Link a collection to a renderlayer * The collection needs to be created separately */ -LayerCollection *BKE_collection_link(SceneLayer *sl, SceneCollection *sc) +LayerCollection *BKE_collection_link(ViewLayer *sl, SceneCollection *sc) { LayerCollection *lc = layer_collection_add(sl, NULL, sc); sl->active_collection = BKE_layer_collection_findindex(sl, lc); @@ -835,7 +835,7 @@ LayerCollection *BKE_collection_link(SceneLayer *sl, SceneCollection *sc) * Unlink a collection base from a renderlayer * The corresponding collection is not removed from the master collection */ -void BKE_collection_unlink(SceneLayer *sl, LayerCollection *lc) +void BKE_collection_unlink(ViewLayer *sl, LayerCollection *lc) { BKE_layer_collection_free(sl, lc); BLI_remlink(&sl->layer_collections, lc); @@ -846,7 +846,7 @@ void BKE_collection_unlink(SceneLayer *sl, LayerCollection *lc) /** * Recursively enable nested collections */ -static void layer_collection_enable(SceneLayer *sl, LayerCollection *lc) +static void layer_collection_enable(ViewLayer *sl, LayerCollection *lc) { layer_collection_objects_populate(sl, lc, &lc->scene_collection->objects); @@ -857,10 +857,10 @@ static void layer_collection_enable(SceneLayer *sl, LayerCollection *lc) /** * Enable collection - * Add its objects bases to SceneLayer + * Add its objects bases to ViewLayer * Depsgraph needs to be rebuilt afterwards */ -void BKE_collection_enable(SceneLayer *sl, LayerCollection *lc) +void BKE_collection_enable(ViewLayer *sl, LayerCollection *lc) { if ((lc->flag & COLLECTION_DISABLED) == 0) { return; @@ -873,7 +873,7 @@ void BKE_collection_enable(SceneLayer *sl, LayerCollection *lc) /** * Recursively disable nested collections */ -static void layer_collection_disable(SceneLayer *sl, LayerCollection *lc) +static void layer_collection_disable(ViewLayer *sl, LayerCollection *lc) { layer_collection_objects_unpopulate(sl, lc); @@ -884,10 +884,10 @@ static void layer_collection_disable(SceneLayer *sl, LayerCollection *lc) /** * Disable collection - * Remove all its object bases from SceneLayer + * Remove all its object bases from ViewLayer * Depsgraph needs to be rebuilt afterwards */ -void BKE_collection_disable(SceneLayer *sl, LayerCollection *lc) +void BKE_collection_disable(ViewLayer *sl, LayerCollection *lc) { if ((lc->flag & COLLECTION_DISABLED) != 0) { return; @@ -897,7 +897,7 @@ void BKE_collection_disable(SceneLayer *sl, LayerCollection *lc) layer_collection_disable(sl, lc); } -static void layer_collection_object_add(SceneLayer *sl, LayerCollection *lc, Object *ob) +static void layer_collection_object_add(ViewLayer *sl, LayerCollection *lc, Object *ob) { Base *base = object_base_add(sl, ob); @@ -922,26 +922,26 @@ static void layer_collection_object_add(SceneLayer *sl, LayerCollection *lc, Obj BLI_addtail(&lc->object_bases, BLI_genericNodeN(base)); } -static void layer_collection_object_remove(SceneLayer *sl, LayerCollection *lc, Object *ob) +static void layer_collection_object_remove(ViewLayer *sl, LayerCollection *lc, Object *ob) { Base *base; - base = BKE_scene_layer_base_find(sl, ob); + base = BKE_view_layer_base_find(sl, ob); LinkData *link = BLI_findptr(&lc->object_bases, base, offsetof(LinkData, data)); BLI_remlink(&lc->object_bases, link); MEM_freeN(link); - scene_layer_object_base_unref(sl, base); + view_layer_object_base_unref(sl, base); } -static void layer_collection_objects_populate(SceneLayer *sl, LayerCollection *lc, ListBase *objects) +static void layer_collection_objects_populate(ViewLayer *sl, LayerCollection *lc, ListBase *objects) { for (LinkData *link = objects->first; link; link = link->next) { layer_collection_object_add(sl, lc, link->data); } } -static void layer_collection_populate(SceneLayer *sl, LayerCollection *lc, SceneCollection *sc) +static void layer_collection_populate(ViewLayer *sl, LayerCollection *lc, SceneCollection *sc) { layer_collection_objects_populate(sl, lc, &sc->objects); layer_collection_objects_populate(sl, lc, &sc->filter_objects); @@ -951,7 +951,7 @@ static void layer_collection_populate(SceneLayer *sl, LayerCollection *lc, Scene } } -static LayerCollection *layer_collection_add(SceneLayer *sl, LayerCollection *parent, SceneCollection *sc) +static LayerCollection *layer_collection_add(ViewLayer *sl, LayerCollection *parent, SceneCollection *sc) { IDPropertyTemplate val = {0}; LayerCollection *lc = MEM_callocN(sizeof(LayerCollection), "Collection Base"); @@ -979,7 +979,7 @@ static LayerCollection *layer_collection_add(SceneLayer *sl, LayerCollection *pa /** * See if render layer has the scene collection linked directly, or indirectly (nested) */ -bool BKE_scene_layer_has_collection(SceneLayer *sl, const SceneCollection *sc) +bool BKE_view_layer_has_collection(ViewLayer *sl, const SceneCollection *sc) { for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) { if (find_layer_collection_by_scene_collection(lc, sc) != NULL) { @@ -994,8 +994,8 @@ bool BKE_scene_layer_has_collection(SceneLayer *sl, const SceneCollection *sc) */ bool BKE_scene_has_object(Scene *scene, Object *ob) { - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { - Base *base = BKE_scene_layer_base_find(sl, ob); + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { + Base *base = BKE_view_layer_base_find(sl, ob); if (base) { return true; } @@ -1023,11 +1023,11 @@ static LayerCollection *find_layer_collection_by_scene_collection(LayerCollectio } /** - * Add a new LayerCollection for all the SceneLayers that have sc_parent + * Add a new LayerCollection for all the ViewLayers that have sc_parent */ void BKE_layer_sync_new_scene_collection(Scene *scene, const SceneCollection *sc_parent, SceneCollection *sc) { - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) { LayerCollection *lc_parent = find_layer_collection_by_scene_collection(lc, sc_parent); if (lc_parent) { @@ -1042,7 +1042,7 @@ void BKE_layer_sync_new_scene_collection(Scene *scene, const SceneCollection *sc */ void BKE_layer_sync_object_link(const Scene *scene, SceneCollection *sc, Object *ob) { - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) { LayerCollection *found = find_layer_collection_by_scene_collection(lc, sc); if (found) { @@ -1058,7 +1058,7 @@ void BKE_layer_sync_object_link(const Scene *scene, SceneCollection *sc, Object */ void BKE_layer_sync_object_unlink(const Scene *scene, SceneCollection *sc, Object *ob) { - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) { LayerCollection *found = find_layer_collection_by_scene_collection(lc, sc); if (found) { @@ -1074,18 +1074,18 @@ void BKE_layer_sync_object_unlink(const Scene *scene, SceneCollection *sc, Objec /** * Add a new datablock override */ -void BKE_override_scene_layer_datablock_add(SceneLayer *scene_layer, int id_type, const char *data_path, const ID *id) +void BKE_override_view_layer_datablock_add(ViewLayer *view_layer, int id_type, const char *data_path, const ID *id) { - UNUSED_VARS(scene_layer, id_type, data_path, id); + UNUSED_VARS(view_layer, id_type, data_path, id); TODO_LAYER_OVERRIDE; } /** * Add a new int override */ -void BKE_override_scene_layer_int_add(SceneLayer *scene_layer, int id_type, const char *data_path, const int value) +void BKE_override_view_layer_int_add(ViewLayer *view_layer, int id_type, const char *data_path, const int value) { - UNUSED_VARS(scene_layer, id_type, data_path, value); + UNUSED_VARS(view_layer, id_type, data_path, value); TODO_LAYER_OVERRIDE; } @@ -1102,7 +1102,7 @@ void BKE_override_layer_collection_boolean_add(struct LayerCollection *layer_col /* Engine Settings */ ListBase R_layer_collection_engines_settings_callbacks = {NULL, NULL}; -ListBase R_scene_layer_engines_settings_callbacks = {NULL, NULL}; +ListBase R_view_layer_engines_settings_callbacks = {NULL, NULL}; typedef struct EngineSettingsCB_Type { struct EngineSettingsCB_Type *next, *prev; @@ -1128,7 +1128,7 @@ static void create_layer_collection_engine_settings_scene(Scene *scene, EngineSe create_engine_settings_scene(scene->collection_properties, es_type); } -static void create_scene_layer_engine_settings_scene(Scene *scene, EngineSettingsCB_Type *es_type) +static void create_view_layer_engine_settings_scene(Scene *scene, EngineSettingsCB_Type *es_type) { create_engine_settings_scene(scene->layer_properties, es_type); } @@ -1152,22 +1152,22 @@ static void create_layer_collection_engines_settings_scene(Scene *scene, EngineS /* Populate the scene with the new settings. */ create_layer_collection_engine_settings_scene(scene, es_type); - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) { create_layer_collection_engine_settings_collection(lc, es_type); } } } -static void create_scene_layer_engines_settings_scene(Scene *scene, EngineSettingsCB_Type *es_type) +static void create_view_layer_engines_settings_scene(Scene *scene, EngineSettingsCB_Type *es_type) { /* Populate the scene with the new settings. */ - create_scene_layer_engine_settings_scene(scene, es_type); + create_view_layer_engine_settings_scene(scene, es_type); } -static void create_scene_layer_engines_settings_layer(SceneLayer *sl, EngineSettingsCB_Type *es_type) +static void create_view_layer_engines_settings_layer(ViewLayer *sl, EngineSettingsCB_Type *es_type) { - if (BKE_scene_layer_engine_layer_get(sl, COLLECTION_MODE_NONE, es_type->name)) { + if (BKE_view_layer_engine_layer_get(sl, COLLECTION_MODE_NONE, es_type->name)) { return; } @@ -1209,19 +1209,19 @@ void BKE_layer_collection_engine_settings_callback_register( } } -void BKE_scene_layer_engine_settings_callback_register( +void BKE_view_layer_engine_settings_callback_register( Main *bmain, const char *engine_name, EngineSettingsCB func) { EngineSettingsCB_Type *es_type = - engine_settings_callback_register(engine_name, func, &R_scene_layer_engines_settings_callbacks); + engine_settings_callback_register(engine_name, func, &R_view_layer_engines_settings_callbacks); if (bmain) { /* Populate all of the collections of the scene with those settings. */ for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { - create_scene_layer_engines_settings_scene(scene, es_type); + create_view_layer_engines_settings_scene(scene, es_type); - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { - create_scene_layer_engines_settings_layer(sl, es_type); + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { + create_view_layer_engines_settings_layer(sl, es_type); } } } @@ -1232,9 +1232,9 @@ void BKE_layer_collection_engine_settings_callback_free(void) BLI_freelistN(&R_layer_collection_engines_settings_callbacks); } -void BKE_scene_layer_engine_settings_callback_free(void) +void BKE_view_layer_engine_settings_callback_free(void) { - BLI_freelistN(&R_scene_layer_engines_settings_callbacks); + BLI_freelistN(&R_view_layer_engines_settings_callbacks); } /** @@ -1331,10 +1331,10 @@ static void layer_collection_create_render_settings(IDProperty *root, const bool } } -static void scene_layer_create_render_settings(IDProperty *root, const bool populate) +static void view_layer_create_render_settings(IDProperty *root, const bool populate) { EngineSettingsCB_Type *es_type; - for (es_type = R_scene_layer_engines_settings_callbacks.first; es_type; es_type = es_type->next) { + for (es_type = R_view_layer_engines_settings_callbacks.first; es_type; es_type = es_type->next) { IDProperty *props = collection_engine_settings_create(es_type, populate); IDP_AddToGroup(root, props); } @@ -1432,7 +1432,7 @@ IDProperty *BKE_layer_collection_engine_scene_get(Scene *scene, const int type, /** * Return scene layer engine settings for specified engine in the scene */ -IDProperty *BKE_scene_layer_engine_scene_get(Scene *scene, const int type, const char *engine_name) +IDProperty *BKE_view_layer_engine_scene_get(Scene *scene, const int type, const char *engine_name) { return collection_engine_get(scene->layer_properties, type, engine_name); } @@ -1440,7 +1440,7 @@ IDProperty *BKE_scene_layer_engine_scene_get(Scene *scene, const int type, const /** * Return scene layer engine settings for specified engine */ -IDProperty *BKE_scene_layer_engine_layer_get(SceneLayer *sl, const int type, const char *engine_name) +IDProperty *BKE_view_layer_engine_layer_get(ViewLayer *sl, const int type, const char *engine_name) { return collection_engine_get(sl->properties, type, engine_name); } @@ -1448,7 +1448,7 @@ IDProperty *BKE_scene_layer_engine_layer_get(SceneLayer *sl, const int type, con /** * Return scene layer evaluated engine settings for specified engine */ -IDProperty *BKE_scene_layer_engine_evaluated_get(SceneLayer *sl, const int type, const char *engine_name) +IDProperty *BKE_view_layer_engine_evaluated_get(ViewLayer *sl, const int type, const char *engine_name) { return collection_engine_get(sl->properties_evaluated, type, engine_name); } @@ -1553,7 +1553,7 @@ static void collection_engine_settings_init(IDProperty *root, const bool populat static void layer_engine_settings_init(IDProperty *root, const bool populate) { /* render engines */ - scene_layer_create_render_settings(root, populate); + view_layer_create_render_settings(root, populate); /* mode engines */ layer_create_mode_settings(root, populate); @@ -1572,7 +1572,7 @@ void BKE_layer_collection_engine_settings_create(IDProperty *root) * Initialize the render setings * It's used mainly for scenes */ -void BKE_scene_layer_engine_settings_create(IDProperty *root) +void BKE_view_layer_engine_settings_create(IDProperty *root) { layer_engine_settings_init(root, true); } @@ -1586,11 +1586,11 @@ static struct { IDProperty *collection_properties; IDProperty *render_settings; } scene; - IDProperty *scene_layer; + IDProperty *view_layer; IDProperty *layer_collection; } root_reference = { .scene = {NULL, NULL}, - .scene_layer = NULL, + .view_layer = NULL, .layer_collection = NULL, }; @@ -1618,9 +1618,9 @@ static void engine_settings_validate_init(void) layer_engine_settings_init(root_reference.scene.render_settings, true); } - if (root_reference.scene_layer == NULL) { - root_reference.scene_layer = IDP_New(IDP_GROUP, &val, ROOT_PROP); - layer_engine_settings_init(root_reference.scene_layer, false); + if (root_reference.view_layer == NULL) { + root_reference.view_layer = IDP_New(IDP_GROUP, &val, ROOT_PROP); + layer_engine_settings_init(root_reference.view_layer, false); } } @@ -1632,7 +1632,7 @@ static void layer_collection_engine_settings_validate_free(void) IDProperty *idprops[] = { root_reference.scene.render_settings, root_reference.scene.collection_properties, - root_reference.scene_layer, + root_reference.view_layer, root_reference.layer_collection, NULL, }; @@ -1683,7 +1683,7 @@ void BKE_layer_collection_engine_settings_validate_collection(LayerCollection *l /** * Make sure Scene has all required collection settings. */ -void BKE_scene_layer_engine_settings_validate_scene(Scene *scene) +void BKE_view_layer_engine_settings_validate_scene(Scene *scene) { if (root_reference.scene.render_settings == NULL) { engine_settings_validate_init(); @@ -1692,7 +1692,7 @@ void BKE_scene_layer_engine_settings_validate_scene(Scene *scene) if (scene->layer_properties == NULL) { IDPropertyTemplate val = {0}; scene->layer_properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); - BKE_scene_layer_engine_settings_create(scene->layer_properties); + BKE_view_layer_engine_settings_create(scene->layer_properties); } else { IDP_MergeGroup(scene->layer_properties, root_reference.scene.render_settings, false); @@ -1702,13 +1702,13 @@ void BKE_scene_layer_engine_settings_validate_scene(Scene *scene) /** * Make sure Scene has all required collection settings. */ -void BKE_scene_layer_engine_settings_validate_layer(SceneLayer *sl) +void BKE_view_layer_engine_settings_validate_layer(ViewLayer *sl) { - if (root_reference.scene_layer == NULL) { + if (root_reference.view_layer == NULL) { engine_settings_validate_init(); } - IDP_MergeGroup(sl->properties, root_reference.scene_layer, false); + IDP_MergeGroup(sl->properties, root_reference.view_layer, false); } /* ---------------------------------------------------------------------- */ @@ -1716,7 +1716,7 @@ void BKE_scene_layer_engine_settings_validate_layer(SceneLayer *sl) static void object_bases_iterator_begin(BLI_Iterator *iter, void *data_in, const int flag) { - SceneLayer *sl = data_in; + ViewLayer *sl = data_in; Base *base = sl->object_bases.first; /* when there are no objects */ @@ -1834,17 +1834,17 @@ void BKE_renderable_objects_iterator_begin(BLI_Iterator *iter, void *data_in) ObjectsRenderableIteratorData *data = data_in; for (Scene *scene = data->scene; scene; scene = scene->set) { - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { for (Base *base = sl->object_bases.first; base; base = base->next) { base->object->id.flag |= LIB_TAG_DOIT; } } } - SceneLayer *scene_layer = data->scene->render_layers.first; - data->iter.scene_layer = scene_layer; + ViewLayer *view_layer = data->scene->view_layers.first; + data->iter.view_layer = view_layer; - Base base = {(Base *)scene_layer->object_bases.first, NULL}; + Base base = {(Base *)view_layer->object_bases.first, NULL}; data->iter.base = &base; data->iter.set = NULL; @@ -1873,11 +1873,11 @@ void BKE_renderable_objects_iterator_next(BLI_Iterator *iter) /* Time to go to the next scene layer. */ if (data->iter.set == NULL) { - while ((data->iter.scene_layer = data->iter.scene_layer->next)) { - SceneLayer *scene_layer = data->iter.scene_layer; - if (scene_layer->flag & SCENE_LAYER_RENDER) { + while ((data->iter.view_layer = data->iter.view_layer->next)) { + ViewLayer *view_layer = data->iter.view_layer; + if (view_layer->flag & VIEW_LAYER_RENDER) { - Base base_iter = {(Base *)scene_layer->object_bases.first, NULL}; + Base base_iter = {(Base *)view_layer->object_bases.first, NULL}; data->iter.base = &base_iter; BKE_renderable_objects_iterator_next(iter); @@ -1894,9 +1894,9 @@ void BKE_renderable_objects_iterator_next(BLI_Iterator *iter) /* Look for an object in the next set. */ while ((data->iter.set = data->iter.set->set)) { - SceneLayer *scene_layer = BKE_scene_layer_from_scene_get(data->iter.set); + ViewLayer *view_layer = BKE_view_layer_from_scene_get(data->iter.set); - Base base_iter = {(Base *)scene_layer->object_bases.first, NULL}; + Base base_iter = {(Base *)view_layer->object_bases.first, NULL}; data->iter.base = &base_iter; BKE_renderable_objects_iterator_next(iter); @@ -1934,20 +1934,20 @@ static void idproperty_reset(IDProperty **props, IDProperty *props_ref) } void BKE_layer_eval_layer_collection_pre(const struct EvaluationContext *UNUSED(eval_ctx), - Scene *scene, SceneLayer *scene_layer) + Scene *scene, ViewLayer *view_layer) { - DEBUG_PRINT("%s on %s (%p)\n", __func__, scene_layer->name, scene_layer); - for (Base *base = scene_layer->object_bases.first; base != NULL; base = base->next) { + DEBUG_PRINT("%s on %s (%p)\n", __func__, view_layer->name, view_layer); + for (Base *base = view_layer->object_bases.first; base != NULL; base = base->next) { base->flag &= ~(BASE_VISIBLED | BASE_SELECTABLED); idproperty_reset(&base->collection_properties, scene->collection_properties); } /* Sync properties from scene to scene layer. */ - idproperty_reset(&scene_layer->properties_evaluated, scene->layer_properties); - IDP_MergeGroup(scene_layer->properties_evaluated, scene_layer->properties, true); + idproperty_reset(&view_layer->properties_evaluated, scene->layer_properties); + IDP_MergeGroup(view_layer->properties_evaluated, view_layer->properties, true); /* TODO(sergey): Is it always required? */ - scene_layer->flag |= SCENE_LAYER_ENGINE_DIRTY; + view_layer->flag |= VIEW_LAYER_ENGINE_DIRTY; } void BKE_layer_eval_layer_collection(const struct EvaluationContext *UNUSED(eval_ctx), @@ -1998,11 +1998,11 @@ void BKE_layer_eval_layer_collection(const struct EvaluationContext *UNUSED(eval } void BKE_layer_eval_layer_collection_post(const struct EvaluationContext *UNUSED(eval_ctx), - SceneLayer *scene_layer) + ViewLayer *view_layer) { - DEBUG_PRINT("%s on %s (%p)\n", __func__, scene_layer->name, scene_layer); + DEBUG_PRINT("%s on %s (%p)\n", __func__, view_layer->name, view_layer); /* if base is not selectabled, clear select */ - for (Base *base = scene_layer->object_bases.first; base; base = base->next) { + for (Base *base = view_layer->object_bases.first; base; base = base->next) { if ((base->flag & BASE_SELECTABLED) == 0) { base->flag &= ~BASE_SELECTED; } diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c index d83cd2392fd..93bc4be7954 100644 --- a/source/blender/blenkernel/intern/library_query.c +++ b/source/blender/blenkernel/intern/library_query.c @@ -451,19 +451,19 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call } FOREACH_SCENE_COLLECTION_END - SceneLayer *scene_layer; - for (scene_layer = scene->render_layers.first; scene_layer; scene_layer = scene_layer->next) { - for (Base *base = scene_layer->object_bases.first; base; base = base->next) { + ViewLayer *view_layer; + for (view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { + for (Base *base = view_layer->object_bases.first; base; base = base->next) { CALLBACK_INVOKE(base->object, IDWALK_NOP); } - for (FreestyleModuleConfig *fmc = scene_layer->freestyle_config.modules.first; fmc; fmc = fmc->next) { + for (FreestyleModuleConfig *fmc = view_layer->freestyle_config.modules.first; fmc; fmc = fmc->next) { if (fmc->script) { CALLBACK_INVOKE(fmc->script, IDWALK_CB_NOP); } } - for (FreestyleLineSet *fls = scene_layer->freestyle_config.linesets.first; fls; fls = fls->next) { + for (FreestyleLineSet *fls = view_layer->freestyle_config.linesets.first; fls; fls = fls->next) { if (fls->group) { CALLBACK_INVOKE(fls->group, IDWALK_CB_USER); } diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c index c82c002ebb1..3a69eb2b86b 100644 --- a/source/blender/blenkernel/intern/linestyle.c +++ b/source/blender/blenkernel/intern/linestyle.c @@ -215,7 +215,7 @@ void BKE_linestyle_make_local(struct Main *bmain, FreestyleLineStyle *linestyle, FreestyleLineStyle *BKE_linestyle_active_from_scene(Scene *scene) { - SceneLayer *active_render_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *active_render_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); if (active_render_layer) { FreestyleConfig *config = &active_render_layer->freestyle_config; FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(config); diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index d5cddf34eb5..1a93746b515 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -372,7 +372,7 @@ Object *BKE_mball_basis_find(Scene *scene, Object *basis) BLI_split_name_num(basisname, &basisnr, basis->id.name + 2, '.'); - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { for (Base *base = sl->object_bases.first; base; base = base->next) { Object *ob = base->object; if ((ob->type == OB_MBALL) && !(base->flag & OB_FROMDUPLI)) { diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 972596b0cb1..95394f6be63 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -715,13 +715,13 @@ Object *BKE_object_add_only_object(Main *bmain, int type, const char *name) } -static Object *object_add_common(Main *bmain, SceneLayer *scene_layer, int type, const char *name) +static Object *object_add_common(Main *bmain, ViewLayer *view_layer, int type, const char *name) { Object *ob; ob = BKE_object_add_only_object(bmain, type, name); ob->data = BKE_object_obdata_add_from_type(bmain, type, name); - BKE_scene_layer_base_deselect_all(scene_layer); + BKE_view_layer_base_deselect_all(view_layer); DEG_id_tag_update_ex(bmain, &ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); return ob; @@ -731,24 +731,24 @@ static Object *object_add_common(Main *bmain, SceneLayer *scene_layer, int type, * General add: to scene, with layer from area and default name * * Object is added to the active SceneCollection. - * If there is no linked collection to the active SceneLayer we create a new one. + * If there is no linked collection to the active ViewLayer we create a new one. */ /* creates minimum required data, but without vertices etc. */ Object *BKE_object_add( - Main *bmain, Scene *scene, SceneLayer *scene_layer, + Main *bmain, Scene *scene, ViewLayer *view_layer, int type, const char *name) { Object *ob; Base *base; LayerCollection *layer_collection; - ob = object_add_common(bmain, scene_layer, type, name); + ob = object_add_common(bmain, view_layer, type, name); - layer_collection = BKE_layer_collection_get_active_ensure(scene, scene_layer); + layer_collection = BKE_layer_collection_get_active_ensure(scene, view_layer); BKE_collection_object_add(scene, layer_collection->scene_collection, ob); - base = BKE_scene_layer_base_find(scene_layer, ob); - BKE_scene_layer_base_select(scene_layer, base); + base = BKE_view_layer_base_find(view_layer, ob); + BKE_view_layer_base_select(view_layer, base); return ob; } @@ -759,17 +759,17 @@ Object *BKE_object_add( * /param ob_src object to use to determine the collections of the new object. */ Object *BKE_object_add_from( - Main *bmain, Scene *scene, SceneLayer *scene_layer, + Main *bmain, Scene *scene, ViewLayer *view_layer, int type, const char *name, Object *ob_src) { Object *ob; Base *base; - ob = object_add_common(bmain, scene_layer, type, name); + ob = object_add_common(bmain, view_layer, type, name); BKE_collection_object_add_from(scene, ob_src, ob); - base = BKE_scene_layer_base_find(scene_layer, ob); - BKE_scene_layer_base_select(scene_layer, base); + base = BKE_view_layer_base_find(view_layer, ob); + BKE_view_layer_base_select(view_layer, base); return ob; } @@ -864,7 +864,7 @@ static LodLevel *lod_level_select(Object *ob, const float camera_position[3]) return current; } -bool BKE_object_lod_is_usable(Object *ob, SceneLayer *sl) +bool BKE_object_lod_is_usable(Object *ob, ViewLayer *sl) { bool active = (sl) ? ob == OBACT(sl) : false; return (ob->mode == OB_MODE_OBJECT || !active); @@ -880,7 +880,7 @@ void BKE_object_lod_update(Object *ob, const float camera_position[3]) } } -static Object *lod_ob_get(Object *ob, SceneLayer *sl, int flag) +static Object *lod_ob_get(Object *ob, ViewLayer *sl, int flag) { LodLevel *current = ob->currentlod; @@ -894,12 +894,12 @@ static Object *lod_ob_get(Object *ob, SceneLayer *sl, int flag) return current->source; } -struct Object *BKE_object_lod_meshob_get(Object *ob, SceneLayer *sl) +struct Object *BKE_object_lod_meshob_get(Object *ob, ViewLayer *sl) { return lod_ob_get(ob, sl, OB_LOD_USE_MESH); } -struct Object *BKE_object_lod_matob_get(Object *ob, SceneLayer *sl) +struct Object *BKE_object_lod_matob_get(Object *ob, ViewLayer *sl) { return lod_ob_get(ob, sl, OB_LOD_USE_MAT); } @@ -2566,7 +2566,7 @@ void BKE_object_foreach_display_point( } void BKE_scene_foreach_display_point( - Scene *scene, SceneLayer *sl, + Scene *scene, ViewLayer *sl, void (*func_cb)(const float[3], void *), void *user_data) { Base *base; @@ -3370,19 +3370,19 @@ static void obrel_list_add(LinkNode **links, Object *ob) * If OB_SET_VISIBLE or OB_SET_SELECTED are collected, * then also add related objects according to the given includeFilters. */ -LinkNode *BKE_object_relational_superset(struct SceneLayer *scene_layer, eObjectSet objectSet, eObRelationTypes includeFilter) +LinkNode *BKE_object_relational_superset(struct ViewLayer *view_layer, eObjectSet objectSet, eObRelationTypes includeFilter) { LinkNode *links = NULL; Base *base; /* Remove markers from all objects */ - for (base = scene_layer->object_bases.first; base; base = base->next) { + for (base = view_layer->object_bases.first; base; base = base->next) { base->object->id.tag &= ~LIB_TAG_DOIT; } /* iterate over all selected and visible objects */ - for (base = scene_layer->object_bases.first; base; base = base->next) { + for (base = view_layer->object_bases.first; base; base = base->next) { if (objectSet == OB_SET_ALL) { /* as we get all anyways just add it */ Object *ob = base->object; @@ -3419,7 +3419,7 @@ LinkNode *BKE_object_relational_superset(struct SceneLayer *scene_layer, eObject /* child relationship */ if (includeFilter & (OB_REL_CHILDREN | OB_REL_CHILDREN_RECURSIVE)) { Base *local_base; - for (local_base = scene_layer->object_bases.first; local_base; local_base = local_base->next) { + for (local_base = view_layer->object_bases.first; local_base; local_base = local_base->next) { if (BASE_EDITABLE_BGMODE(local_base)) { Object *child = local_base->object; diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index bfc99e1f238..85635cb7d77 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -75,7 +75,7 @@ typedef struct DupliContext { Group *group; /* XXX child objects are selected from this group if set, could be nicer */ Scene *scene; - SceneLayer *scene_layer; + ViewLayer *view_layer; Object *object; float space_mat[4][4]; @@ -100,7 +100,7 @@ static void init_context(DupliContext *r_ctx, const EvaluationContext *eval_ctx, { r_ctx->eval_ctx = eval_ctx; r_ctx->scene = scene; - r_ctx->scene_layer = eval_ctx->scene_layer; + r_ctx->view_layer = eval_ctx->view_layer; /* don't allow BKE_object_handle_update for viewport during render, can crash */ r_ctx->do_update = update && !(G.is_rendering && eval_ctx->mode != DAG_EVAL_RENDER); r_ctx->animated = false; @@ -258,8 +258,8 @@ static void make_child_duplis(const DupliContext *ctx, void *userdata, MakeChild } else { int baseid = 0; - SceneLayer *scene_layer = ctx->scene_layer; - for (Base *base = scene_layer->object_bases.first; base; base = base->next, baseid++) { + ViewLayer *view_layer = ctx->view_layer; + for (Base *base = view_layer->object_bases.first; base; base = base->next, baseid++) { Object *ob = base->object; if ((base->flag & BASE_VISIBLED) && ob != obedit && is_child(ob, parent)) { DupliContext pctx; diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index a2c59434862..df5851f927c 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -75,7 +75,7 @@ const char PAINT_CURSOR_TEXTURE_PAINT[3] = {255, 255, 255}; static eOverlayControlFlags overlay_flags = 0; -void BKE_paint_invalidate_overlay_tex(Scene *scene, SceneLayer *sl, const Tex *tex) +void BKE_paint_invalidate_overlay_tex(Scene *scene, ViewLayer *sl, const Tex *tex) { Paint *p = BKE_paint_get_active(scene, sl); Brush *br = p->brush; @@ -89,7 +89,7 @@ void BKE_paint_invalidate_overlay_tex(Scene *scene, SceneLayer *sl, const Tex *t overlay_flags |= PAINT_INVALID_OVERLAY_TEXTURE_SECONDARY; } -void BKE_paint_invalidate_cursor_overlay(Scene *scene, SceneLayer *sl, CurveMapping *curve) +void BKE_paint_invalidate_cursor_overlay(Scene *scene, ViewLayer *sl, CurveMapping *curve) { Paint *p = BKE_paint_get_active(scene, sl); Brush *br = p->brush; @@ -157,7 +157,7 @@ Paint *BKE_paint_get_active_from_paintmode(Scene *sce, ePaintMode mode) return NULL; } -Paint *BKE_paint_get_active(Scene *sce, SceneLayer *sl) +Paint *BKE_paint_get_active(Scene *sce, ViewLayer *sl) { if (sce && sl) { ToolSettings *ts = sce->toolsettings; @@ -189,7 +189,7 @@ Paint *BKE_paint_get_active(Scene *sce, SceneLayer *sl) Paint *BKE_paint_get_active_from_context(const bContext *C) { Scene *sce = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); SpaceImage *sima; if (sce && sl) { @@ -240,7 +240,7 @@ Paint *BKE_paint_get_active_from_context(const bContext *C) ePaintMode BKE_paintmode_get_active_from_context(const bContext *C) { Scene *sce = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); SpaceImage *sima; if (sce && sl) { diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index ee1c94554e3..209c7398d38 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -252,7 +252,7 @@ struct LatticeDeformData *psys_create_lattice_deform_data(ParticleSimulationData { struct LatticeDeformData *lattice_deform_data = NULL; - if (psys_in_edit_mode(sim->eval_ctx->scene_layer, sim->psys) == 0) { + if (psys_in_edit_mode(sim->eval_ctx->view_layer, sim->psys) == 0) { Object *lattice = NULL; ModifierData *md = (ModifierData *)psys_get_modifier(sim->ob, sim->psys); int mode = G.is_rendering ? eModifierMode_Render : eModifierMode_Realtime; @@ -289,11 +289,11 @@ void psys_enable_all(Object *ob) psys->flag &= ~PSYS_DISABLED; } -bool psys_in_edit_mode(SceneLayer *scene_layer, ParticleSystem *psys) +bool psys_in_edit_mode(ViewLayer *view_layer, ParticleSystem *psys) { - return (scene_layer->basact && - (scene_layer->basact->object->mode & OB_MODE_PARTICLE_EDIT) && - psys == psys_get_current((scene_layer->basact)->object) && + return (view_layer->basact && + (view_layer->basact->object->mode & OB_MODE_PARTICLE_EDIT) && + psys == psys_get_current((view_layer->basact)->object) && (psys->edit || psys->pointcache->edit) && !psys->renderdata); } @@ -2097,7 +2097,7 @@ static bool psys_thread_context_init_path( psys_thread_context_init(ctx, sim); /*---start figuring out what is actually wanted---*/ - if (psys_in_edit_mode(sim->eval_ctx->scene_layer, psys)) { + if (psys_in_edit_mode(sim->eval_ctx->view_layer, psys)) { ParticleEditSettings *pset = &scene->toolsettings->particle; if ((psys->renderdata == 0 && use_render_params == 0) && (psys->edit == NULL || pset->flag & PE_DRAW_PART) == 0) @@ -2186,7 +2186,7 @@ static void psys_thread_create_path(ParticleTask *task, struct ChildParticle *cp ParticleSystem *psys = ctx->sim.psys; ParticleSettings *part = psys->part; ParticleCacheKey **cache = psys->childcache; - ParticleCacheKey **pcache = psys_in_edit_mode(ctx->sim.eval_ctx->scene_layer, psys) && psys->edit ? psys->edit->pathcache : psys->pathcache; + ParticleCacheKey **pcache = psys_in_edit_mode(ctx->sim.eval_ctx->view_layer, psys) && psys->edit ? psys->edit->pathcache : psys->pathcache; ParticleCacheKey *child, *key[4]; ParticleTexture ptex; float *cpa_fuv = 0, *par_rot = 0, rot[4]; @@ -2595,7 +2595,7 @@ void psys_cache_paths(ParticleSimulationData *sim, float cfra, const bool use_re if ((psys->flag & PSYS_HAIR_DONE || psys->flag & PSYS_KEYED || psys->pointcache) == 0) return; - if (psys_in_edit_mode(sim->eval_ctx->scene_layer, psys)) + if (psys_in_edit_mode(sim->eval_ctx->view_layer, psys)) if (psys->renderdata == 0 && (psys->edit == NULL || pset->flag & PE_DRAW_PART) == 0) return; @@ -3778,7 +3778,7 @@ void psys_get_particle_on_path(ParticleSimulationData *sim, int p, ParticleKey * pind.bspline = (psys->part->flag & PART_HAIR_BSPLINE); /* pind.dm disabled in editmode means we don't get effectors taken into * account when subdividing for instance */ - pind.dm = psys_in_edit_mode(sim->eval_ctx->scene_layer, psys) ? NULL : psys->hair_out_dm; + pind.dm = psys_in_edit_mode(sim->eval_ctx->view_layer, psys) ? NULL : psys->hair_out_dm; init_particle_interpolation(sim->ob, psys, pa, &pind); do_particle_interpolation(psys, p, pa, t, &pind, state); diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 14f67aaea39..da227514512 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -2933,7 +2933,7 @@ static void psys_update_path_cache(ParticleSimulationData *sim, float cfra, cons skip = 1; /* draw visualization */ else if (psys->pointcache->flag & PTCACHE_BAKING) skip = 1; /* no need to cache paths while baking dynamics */ - else if (psys_in_edit_mode(sim->eval_ctx->scene_layer, psys)) { + else if (psys_in_edit_mode(sim->eval_ctx->view_layer, psys)) { if ((pset->flag & PE_DRAW_PART)==0) skip = 1; else if (part->childtype==0 && (psys->flag & PSYS_HAIR_DYNAMICS && psys->pointcache->flag & PTCACHE_BAKED)==0) diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index abe8c8f8981..b794fcfd929 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -3509,14 +3509,14 @@ PointCache *BKE_ptcache_copy_list(ListBase *ptcaches_new, const ListBase *ptcach * every user action changing stuff, and then it runs a complete bake??? (ton) */ /* Baking */ -void BKE_ptcache_quick_cache_all(Main *bmain, Scene *scene, SceneLayer *scene_layer) +void BKE_ptcache_quick_cache_all(Main *bmain, Scene *scene, ViewLayer *view_layer) { PTCacheBaker baker; memset(&baker, 0, sizeof(baker)); baker.main = bmain; baker.scene = scene; - baker.scene_layer = scene_layer; + baker.view_layer = view_layer; baker.bake = 0; baker.render = 0; baker.anim_init = 0; @@ -3542,7 +3542,7 @@ void BKE_ptcache_bake(PTCacheBaker *baker) { Main *bmain = baker->main; Scene *scene = baker->scene; - SceneLayer *scene_layer = baker->scene_layer; + ViewLayer *view_layer = baker->view_layer; struct Depsgraph *depsgraph = baker->depsgraph; Scene *sce_iter; /* SETLOOPER macro only */ Base *base; @@ -3606,7 +3606,7 @@ void BKE_ptcache_bake(PTCacheBaker *baker) } } else { - for (SETLOOPER_SCENE_LAYER(scene, scene_layer, sce_iter, base)) { + for (SETLOOPER_VIEW_LAYER(scene, view_layer, sce_iter, base)) { /* cache/bake everything in the scene */ BKE_ptcache_ids_from_object(&pidlist, base->object, scene, MAX_DUPLI_RECUR); @@ -3662,7 +3662,7 @@ void BKE_ptcache_bake(PTCacheBaker *baker) stime = ptime = PIL_check_seconds_timer(); for (int fr = CFRA; fr <= endframe; fr += baker->quick_step, CFRA = fr) { - BKE_scene_graph_update_for_newframe(G.main->eval_ctx, depsgraph, bmain, scene, scene_layer); + BKE_scene_graph_update_for_newframe(G.main->eval_ctx, depsgraph, bmain, scene, view_layer); if (baker->update_progress) { float progress = ((float)(CFRA - startframe)/(float)(endframe - startframe)); @@ -3717,7 +3717,7 @@ void BKE_ptcache_bake(PTCacheBaker *baker) } } else { - for (SETLOOPER_SCENE_LAYER(scene, scene_layer, sce_iter, base)) { + for (SETLOOPER_VIEW_LAYER(scene, view_layer, sce_iter, base)) { BKE_ptcache_ids_from_object(&pidlist, base->object, scene, MAX_DUPLI_RECUR); for (pid=pidlist.first; pid; pid=pid->next) { @@ -3748,7 +3748,7 @@ void BKE_ptcache_bake(PTCacheBaker *baker) CFRA = cfrao; if (bake) { /* already on cfra unless baking */ - BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, scene_layer); + BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, view_layer); } /* TODO: call redraw all windows somehow */ diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index e231fd53fe3..b4e7c14e30c 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -213,7 +213,7 @@ static void layer_collections_sync_flags(ListBase *layer_collections_dst, const /* recreate the LayerCollection tree */ static void layer_collections_recreate( - SceneLayer *sl_dst, ListBase *lb_src, SceneCollection *mc_dst, SceneCollection *mc_src) + ViewLayer *sl_dst, ListBase *lb_src, SceneCollection *mc_dst, SceneCollection *mc_src) { for (LayerCollection *lc_src = lb_src->first; lc_src; lc_src = lc_src->next) { SceneCollection *sc_dst = scene_collection_from_new_tree(lc_src->scene_collection, mc_dst, mc_src); @@ -251,34 +251,34 @@ void BKE_scene_copy_data(Main *bmain, Scene *sce_dst, const Scene *sce_src, cons scene_collection_copy(mc_dst, mc_src, flag_subdata); IDPropertyTemplate val = {0}; - BLI_duplicatelist(&sce_dst->render_layers, &sce_src->render_layers); - for (SceneLayer *scene_layer_src = sce_src->render_layers.first, *scene_layer_dst = sce_dst->render_layers.first; - scene_layer_src; - scene_layer_src = scene_layer_src->next, scene_layer_dst = scene_layer_dst->next) + BLI_duplicatelist(&sce_dst->view_layers, &sce_src->view_layers); + for (ViewLayer *view_layer_src = sce_src->view_layers.first, *view_layer_dst = sce_dst->view_layers.first; + view_layer_src; + view_layer_src = view_layer_src->next, view_layer_dst = view_layer_dst->next) { - if (scene_layer_dst->id_properties != NULL) { - scene_layer_dst->id_properties = IDP_CopyProperty_ex(scene_layer_dst->id_properties, flag_subdata); + if (view_layer_dst->id_properties != NULL) { + view_layer_dst->id_properties = IDP_CopyProperty_ex(view_layer_dst->id_properties, flag_subdata); } - BKE_freestyle_config_copy(&scene_layer_dst->freestyle_config, &scene_layer_src->freestyle_config, flag_subdata); + BKE_freestyle_config_copy(&view_layer_dst->freestyle_config, &view_layer_src->freestyle_config, flag_subdata); - scene_layer_dst->stats = NULL; - scene_layer_dst->properties_evaluated = NULL; - scene_layer_dst->properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); - IDP_MergeGroup_ex(scene_layer_dst->properties, scene_layer_src->properties, true, flag_subdata); + view_layer_dst->stats = NULL; + view_layer_dst->properties_evaluated = NULL; + view_layer_dst->properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); + IDP_MergeGroup_ex(view_layer_dst->properties, view_layer_src->properties, true, flag_subdata); /* we start fresh with no overrides and no visibility flags set * instead of syncing both trees we simply unlink and relink the scene collection */ - BLI_listbase_clear(&scene_layer_dst->layer_collections); - BLI_listbase_clear(&scene_layer_dst->object_bases); - BLI_listbase_clear(&scene_layer_dst->drawdata); + BLI_listbase_clear(&view_layer_dst->layer_collections); + BLI_listbase_clear(&view_layer_dst->object_bases); + BLI_listbase_clear(&view_layer_dst->drawdata); - layer_collections_recreate(scene_layer_dst, &scene_layer_src->layer_collections, mc_dst, mc_src); + layer_collections_recreate(view_layer_dst, &view_layer_src->layer_collections, mc_dst, mc_src); /* Now we handle the syncing for visibility, selectability, ... */ - layer_collections_sync_flags(&scene_layer_dst->layer_collections, &scene_layer_src->layer_collections); + layer_collections_sync_flags(&view_layer_dst->layer_collections, &view_layer_src->layer_collections); - Object *active_ob = OBACT(scene_layer_src); - for (Base *base_src = scene_layer_src->object_bases.first, *base_dst = scene_layer_dst->object_bases.first; + Object *active_ob = OBACT(view_layer_src); + for (Base *base_src = view_layer_src->object_bases.first, *base_dst = view_layer_dst->object_bases.first; base_src; base_src = base_src->next, base_dst = base_dst->next) { @@ -286,7 +286,7 @@ void BKE_scene_copy_data(Main *bmain, Scene *sce_dst, const Scene *sce_src, cons base_dst->flag_legacy = base_src->flag_legacy; if (base_dst->object == active_ob) { - scene_layer_dst->basact = base_dst; + view_layer_dst->basact = base_dst; } } } @@ -410,7 +410,7 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type) rv = sce_copy->r.views; curvemapping_free_data(&sce_copy->r.mblur_shutter_curve); sce_copy->r = sce->r; - sce_copy->active_layer = 0; + sce_copy->active_view_layer = 0; sce_copy->r.views = rv; sce_copy->unit = sce->unit; sce_copy->physics_settings = sce->physics_settings; @@ -508,8 +508,8 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type) if (type == SCE_COPY_FULL) { /* Copy Freestyle LineStyle datablocks. */ - for (SceneLayer *scene_layer_dst = sce_copy->render_layers.first; scene_layer_dst; scene_layer_dst = scene_layer_dst->next) { - for (FreestyleLineSet *lineset = scene_layer_dst->freestyle_config.linesets.first; lineset; lineset = lineset->next) { + for (ViewLayer *view_layer_dst = sce_copy->view_layers.first; view_layer_dst; view_layer_dst = view_layer_dst->next) { + for (FreestyleLineSet *lineset = view_layer_dst->freestyle_config.linesets.first; lineset; lineset = lineset->next) { if (lineset->linestyle) { /* XXX Not copying anim/actions here? */ BKE_id_copy_ex(bmain, (ID *)lineset->linestyle, (ID **)&lineset->linestyle, 0, false); @@ -641,11 +641,11 @@ void BKE_scene_free_ex(Scene *sce, const bool do_id_user) BKE_previewimg_free(&sce->preview); curvemapping_free_data(&sce->r.mblur_shutter_curve); - for (SceneLayer *sl = sce->render_layers.first, *sl_next; sl; sl = sl_next) { + for (ViewLayer *sl = sce->view_layers.first, *sl_next; sl; sl = sl_next) { sl_next = sl->next; - BLI_remlink(&sce->render_layers, sl); - BKE_scene_layer_free(sl); + BLI_remlink(&sce->view_layers, sl); + BKE_view_layer_free(sl); } /* Master Collection */ @@ -1030,9 +1030,9 @@ void BKE_scene_init(Scene *sce) BKE_layer_collection_engine_settings_create(sce->collection_properties); sce->layer_properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); - BKE_scene_layer_engine_settings_create(sce->layer_properties); + BKE_view_layer_engine_settings_create(sce->layer_properties); - BKE_scene_layer_add(sce, "Render Layer"); + BKE_view_layer_add(sce, "Render Layer"); } Scene *BKE_scene_add(Main *bmain, const char *name) @@ -1053,8 +1053,8 @@ Scene *BKE_scene_add(Main *bmain, const char *name) */ bool BKE_scene_object_find(Scene *scene, Object *ob) { - for (SceneLayer *scene_layer = scene->render_layers.first; scene_layer; scene_layer = scene_layer->next) { - if (BLI_findptr(&scene_layer->object_bases, ob, offsetof(Base, object))) { + for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { + if (BLI_findptr(&view_layer->object_bases, ob, offsetof(Base, object))) { return true; } } @@ -1063,8 +1063,8 @@ bool BKE_scene_object_find(Scene *scene, Object *ob) Object *BKE_scene_object_find_by_name(Scene *scene, const char *name) { - for (SceneLayer *scene_layer = scene->render_layers.first; scene_layer; scene_layer = scene_layer->next) { - for (Base *base = scene_layer->object_bases.first; base; base = base->next) { + for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { + for (Base *base = view_layer->object_bases.first; base; base = base->next) { if (STREQ(base->object->id.name + 2, name)) { return base->object; } @@ -1105,8 +1105,8 @@ void BKE_scene_set_background(Main *bmain, Scene *scene) } /* copy layers and flags from bases to objects */ - for (SceneLayer *scene_layer = scene->render_layers.first; scene_layer; scene_layer = scene_layer->next) { - for (Base *base = scene_layer->object_bases.first; base; base = base->next) { + for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { + for (Base *base = view_layer->object_bases.first; base; base = base->next) { ob = base->object; /* group patch... */ BKE_scene_object_base_flag_sync_from_base(base); @@ -1150,8 +1150,8 @@ int BKE_scene_base_iter_next( /* the first base */ if (iter->phase == F_START) { - SceneLayer *scene_layer = eval_ctx->scene_layer; - *base = scene_layer->object_bases.first; + ViewLayer *view_layer = eval_ctx->view_layer; + *base = view_layer->object_bases.first; if (*base) { *ob = (*base)->object; iter->phase = F_SCENE; @@ -1160,9 +1160,9 @@ int BKE_scene_base_iter_next( /* exception: empty scene layer */ while ((*scene)->set) { (*scene) = (*scene)->set; - SceneLayer *scene_layer_set = BKE_scene_layer_from_scene_get((*scene)); - if (scene_layer_set->object_bases.first) { - *base = scene_layer_set->object_bases.first; + ViewLayer *view_layer_set = BKE_view_layer_from_scene_get((*scene)); + if (view_layer_set->object_bases.first) { + *base = view_layer_set->object_bases.first; *ob = (*base)->object; iter->phase = F_SCENE; break; @@ -1181,9 +1181,9 @@ int BKE_scene_base_iter_next( /* (*scene) is finished, now do the set */ while ((*scene)->set) { (*scene) = (*scene)->set; - SceneLayer *scene_layer_set = BKE_scene_layer_from_scene_get((*scene)); - if (scene_layer_set->object_bases.first) { - *base = scene_layer_set->object_bases.first; + ViewLayer *view_layer_set = BKE_view_layer_from_scene_get((*scene)); + if (view_layer_set->object_bases.first) { + *base = view_layer_set->object_bases.first; *ob = (*base)->object; break; } @@ -1264,8 +1264,8 @@ int BKE_scene_base_iter_next( Scene *BKE_scene_find_from_collection(const Main *bmain, const SceneCollection *scene_collection) { for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { - for (SceneLayer *layer = scene->render_layers.first; layer; layer = layer->next) { - if (BKE_scene_layer_has_collection(layer, scene_collection)) { + for (ViewLayer *layer = scene->view_layers.first; layer; layer = layer->next) { + if (BKE_view_layer_has_collection(layer, scene_collection)) { return scene; } } @@ -1509,25 +1509,25 @@ static void prepare_mesh_for_viewport_render(Main *bmain, Scene *scene) } } -/* TODO(sergey): This actually should become scene_layer_graph or so. +/* TODO(sergey): This actually should become view_layer_graph or so. * Same applies to update_for_newframe. */ void BKE_scene_graph_update_tagged(EvaluationContext *eval_ctx, Depsgraph *depsgraph, Main *bmain, Scene *scene, - SceneLayer *scene_layer) + ViewLayer *view_layer) { /* TODO(sergey): Temporary solution for until pipeline.c is ported. */ - if (scene_layer == NULL) { - scene_layer = DEG_get_evaluated_scene_layer(depsgraph); - BLI_assert(scene_layer != NULL); + if (view_layer == NULL) { + view_layer = DEG_get_evaluated_view_layer(depsgraph); + BLI_assert(view_layer != NULL); } /* TODO(sergey): Some functions here are changing global state, * for example, clearing update tags from bmain. */ /* (Re-)build dependency graph if needed. */ - DEG_graph_relations_update(depsgraph, bmain, scene, scene_layer); + DEG_graph_relations_update(depsgraph, bmain, scene, view_layer); /* Uncomment this to check if graph was properly tagged for update. */ // DEG_debug_graph_relations_validate(depsgraph, bmain, scene); /* Flush editing data if needed. */ @@ -1551,12 +1551,12 @@ void BKE_scene_graph_update_for_newframe(EvaluationContext *eval_ctx, Depsgraph *depsgraph, Main *bmain, Scene *scene, - SceneLayer *scene_layer) + ViewLayer *view_layer) { /* TODO(sergey): Temporary solution for until pipeline.c is ported. */ - if (scene_layer == NULL) { - scene_layer = DEG_get_evaluated_scene_layer(depsgraph); - BLI_assert(scene_layer != NULL); + if (view_layer == NULL) { + view_layer = DEG_get_evaluated_view_layer(depsgraph); + BLI_assert(view_layer != NULL); } /* TODO(sergey): Some functions here are changing global state, * for example, clearing update tags from bmain. @@ -1573,7 +1573,7 @@ void BKE_scene_graph_update_for_newframe(EvaluationContext *eval_ctx, */ BKE_image_update_frame(bmain, scene->r.cfra); BKE_sound_set_cfra(scene->r.cfra); - DEG_graph_relations_update(depsgraph, bmain, scene, scene_layer); + DEG_graph_relations_update(depsgraph, bmain, scene, view_layer); /* Update animated cache files for modifiers. * * TODO(sergey): Make this a depsgraph node? @@ -1678,22 +1678,22 @@ float get_render_aosss_error(const RenderData *r, float error) } /** - * Helper function for the SETLOOPER and SETLOOPER_SCENE_LAYER macros + * Helper function for the SETLOOPER and SETLOOPER_VIEW_LAYER macros * * It iterates over the bases of the active layer and then the bases * of the active layer of the background (set) scenes recursively. */ -Base *_setlooper_base_step(Scene **sce_iter, SceneLayer *scene_layer, Base *base) +Base *_setlooper_base_step(Scene **sce_iter, ViewLayer *view_layer, Base *base) { if (base && base->next) { /* Common case, step to the next. */ return base->next; } - else if ((base == NULL) && (scene_layer != NULL)) { + else if ((base == NULL) && (view_layer != NULL)) { /* First time looping, return the scenes first base. */ /* For the first loop we should get the layer from workspace when available. */ - if (scene_layer->object_bases.first) { - return (Base *)scene_layer->object_bases.first; + if (view_layer->object_bases.first) { + return (Base *)view_layer->object_bases.first; } /* No base on this scene layer. */ goto next_set; @@ -1702,8 +1702,8 @@ Base *_setlooper_base_step(Scene **sce_iter, SceneLayer *scene_layer, Base *base next_set: /* Reached the end, get the next base in the set. */ while ((*sce_iter = (*sce_iter)->set)) { - SceneLayer *scene_layer_set = BKE_scene_layer_from_scene_get((*sce_iter)); - base = (Base *)scene_layer_set->object_bases.first; + ViewLayer *view_layer_set = BKE_view_layer_from_scene_get((*sce_iter)); + base = (Base *)view_layer_set->object_bases.first; if (base) { return base; @@ -1751,9 +1751,9 @@ bool BKE_scene_uses_blender_eevee(const Scene *scene) return BKE_viewrender_uses_blender_eevee(&scene->view_render); } -void BKE_scene_base_flag_to_objects(SceneLayer *scene_layer) +void BKE_scene_base_flag_to_objects(ViewLayer *view_layer) { - Base *base = scene_layer->object_bases.first; + Base *base = view_layer->object_bases.first; while (base) { BKE_scene_object_base_flag_sync_from_base(base); @@ -2238,7 +2238,7 @@ int BKE_scene_multiview_num_videos_get(const RenderData *rd) /* This is a key which identifies depsgraph. */ typedef struct DepsgraphKey { - SceneLayer *scene_layer; + ViewLayer *view_layer; /* TODO(sergey): Need to include window somehow (same layer might be in a * different states in different windows). */ @@ -2247,7 +2247,7 @@ typedef struct DepsgraphKey { static unsigned int depsgraph_key_hash(const void *key_v) { const DepsgraphKey *key = key_v; - unsigned int hash = BLI_ghashutil_ptrhash(key->scene_layer); + unsigned int hash = BLI_ghashutil_ptrhash(key->view_layer); /* TODO(sergey): Include hash from other fields in the key. */ return hash; } @@ -2257,7 +2257,7 @@ static bool depsgraph_key_compare(const void *key_a_v, const void *key_b_v) const DepsgraphKey *key_a = key_a_v; const DepsgraphKey *key_b = key_b_v; /* TODO(sergey): Compare rest of */ - return !(key_a->scene_layer == key_b->scene_layer); + return !(key_a->view_layer == key_b->view_layer); } static void depsgraph_key_free(void *key_v) @@ -2299,11 +2299,11 @@ void BKE_scene_free_depsgraph_hash(Scene *scene) /* Query depsgraph for a specific contexts. */ Depsgraph *BKE_scene_get_depsgraph(Scene *scene, - SceneLayer *scene_layer, + ViewLayer *view_layer, bool allocate) { BLI_assert(scene != NULL); - BLI_assert(scene_layer != NULL); + BLI_assert(view_layer != NULL); /* Make sure hash itself exists. */ if (allocate) { BKE_scene_ensure_depsgraph_hash(scene); @@ -2315,7 +2315,7 @@ Depsgraph *BKE_scene_get_depsgraph(Scene *scene, * depending on whether caller wants us to create depsgraph or not. */ DepsgraphKey key; - key.scene_layer = scene_layer; + key.view_layer = view_layer; Depsgraph *depsgraph; if (allocate) { DepsgraphKey **key_ptr; diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 3e1ebc2a057..a83eba145c9 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -3263,8 +3263,8 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq have_comp = (scene->r.scemode & R_DOCOMP) && scene->use_nodes && scene->nodetree; /* Get depsgraph and scene layer for the strip. */ - SceneLayer *scene_layer = BKE_scene_layer_from_scene_get(scene); - Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, scene_layer, true); + ViewLayer *view_layer = BKE_view_layer_from_scene_get(scene); + Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, view_layer, true); orig_data.scemode = scene->r.scemode; orig_data.cfra = scene->r.cfra; @@ -3315,10 +3315,10 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq /* opengl offscreen render */ context->eval_ctx->engine = RE_engines_find(scene->view_render.engine_id); - BKE_scene_graph_update_for_newframe(context->eval_ctx, depsgraph, context->bmain, scene, scene_layer); + BKE_scene_graph_update_for_newframe(context->eval_ctx, depsgraph, context->bmain, scene, view_layer); ibuf = sequencer_view3d_cb( /* set for OpenGL render (NULL when scrubbing) */ - context->eval_ctx, scene, scene_layer, camera, width, height, IB_rect, + context->eval_ctx, scene, view_layer, camera, width, height, IB_rect, context->scene->r.seq_prev_type, (context->scene->r.seq_flag & R_SEQ_SOLID_TEX) != 0, use_gpencil, use_background, scene->r.alphamode, @@ -3355,7 +3355,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq RE_SetDepsgraph(re, depsgraph); DEG_graph_id_tag_update(context->bmain, depsgraph, &scene->id, 0); - BKE_scene_graph_update_for_newframe(context->eval_ctx, depsgraph, context->bmain, scene, scene_layer); + BKE_scene_graph_update_for_newframe(context->eval_ctx, depsgraph, context->bmain, scene, view_layer); RE_BlenderFrame(re, context->bmain, scene, NULL, camera, scene->lay, frame, false); /* restore previous state after it was toggled on & off by RE_BlenderFrame */ @@ -3415,7 +3415,7 @@ finally: scene->r.subframe = orig_data.subframe; if (is_frame_update) { - BKE_scene_graph_update_for_newframe(context->eval_ctx, depsgraph, context->bmain, scene, scene_layer); + BKE_scene_graph_update_for_newframe(context->eval_ctx, depsgraph, context->bmain, scene, view_layer); } #ifdef DURIAN_CAMERA_SWITCH diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 4483914f1a6..33da3623481 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -695,10 +695,10 @@ void smokeModifier_copy(struct SmokeModifierData *smd, struct SmokeModifierData #ifdef WITH_SMOKE // forward decleration -static void smoke_calc_transparency(SmokeDomainSettings *sds, SceneLayer *sl); +static void smoke_calc_transparency(SmokeDomainSettings *sds, ViewLayer *sl); static float calc_voxel_transp(float *result, float *input, int res[3], int *pixel, float *tRay, float correct); -static int get_lamp(SceneLayer *sl, float *light) +static int get_lamp(ViewLayer *sl, float *light) { Base *base_tmp = NULL; int found_lamp = 0; @@ -2811,7 +2811,7 @@ static void smokeModifier_process( } // create shadows before writing cache so they get stored - smoke_calc_transparency(sds, eval_ctx->scene_layer); + smoke_calc_transparency(sds, eval_ctx->view_layer); if (sds->wt && sds->total_cells > 1) { smoke_turbulence_step(sds->wt, sds->fluid); @@ -2950,7 +2950,7 @@ static void bresenham_linie_3D(int x1, int y1, int z1, int x2, int y2, int z2, f cb(result, input, res, pixel, tRay, correct); } -static void smoke_calc_transparency(SmokeDomainSettings *sds, SceneLayer *sl) +static void smoke_calc_transparency(SmokeDomainSettings *sds, ViewLayer *sl) { float bv[6] = {0}; float light[3]; diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 4d974a1bbd5..1f69fca07fe 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -514,7 +514,7 @@ static void ccd_build_deflector_hash_single(GHash *hash, Object *ob) /** * \note group overrides scene when not NULL. */ -static void ccd_build_deflector_hash(SceneLayer *sl, Group *group, Object *vertexowner, GHash *hash) +static void ccd_build_deflector_hash(ViewLayer *sl, Group *group, Object *vertexowner, GHash *hash) { Object *ob; @@ -560,7 +560,7 @@ static void ccd_update_deflector_hash_single(GHash *hash, Object *ob) /** * \note group overrides scene when not NULL. */ -static void ccd_update_deflector_hash(SceneLayer *sl, Group *group, Object *vertexowner, GHash *hash) +static void ccd_update_deflector_hash(ViewLayer *sl, Group *group, Object *vertexowner, GHash *hash) { Object *ob; @@ -979,7 +979,7 @@ static void free_softbody_intern(SoftBody *sb) /** * \note group overrides scene when not NULL. */ -static bool are_there_deflectors(SceneLayer *sl, Group *group) +static bool are_there_deflectors(ViewLayer *sl, Group *group) { if (group) { for (GroupObject *go = group->gobject.first; go; go = go->next) { @@ -999,7 +999,7 @@ static bool are_there_deflectors(SceneLayer *sl, Group *group) return 0; } -static int query_external_colliders(SceneLayer *sl, Group *group) +static int query_external_colliders(ViewLayer *sl, Group *group) { return(are_there_deflectors(sl, group)); } @@ -2251,7 +2251,7 @@ static void softbody_calc_forcesEx(const struct EvaluationContext *eval_ctx, Sce /* gravity = sb->grav * sb_grav_force_scale(ob); */ /* UNUSED */ /* check conditions for various options */ - do_deflector= query_external_colliders(eval_ctx->scene_layer, sb->collision_group); + do_deflector= query_external_colliders(eval_ctx->view_layer, sb->collision_group); /* do_selfcollision=((ob->softflag & OB_SB_EDGES) && (sb->bspring)&& (ob->softflag & OB_SB_SELF)); */ /* UNUSED */ do_springcollision=do_deflector && (ob->softflag & OB_SB_EDGES) &&(ob->softflag & OB_SB_EDGECOLL); do_aero=((sb->aeroedge)&& (ob->softflag & OB_SB_EDGES)); @@ -2315,7 +2315,7 @@ static void softbody_calc_forces(const struct EvaluationContext *eval_ctx, Scene } /* check conditions for various options */ - do_deflector= query_external_colliders(eval_ctx->scene_layer, sb->collision_group); + do_deflector= query_external_colliders(eval_ctx->view_layer, sb->collision_group); do_selfcollision=((ob->softflag & OB_SB_EDGES) && (sb->bspring)&& (ob->softflag & OB_SB_SELF)); do_springcollision=do_deflector && (ob->softflag & OB_SB_EDGES) &&(ob->softflag & OB_SB_EDGECOLL); do_aero=((sb->aeroedge)&& (ob->softflag & OB_SB_EDGES)); @@ -3526,11 +3526,11 @@ static void softbody_step(const struct EvaluationContext *eval_ctx, Scene *scene */ if (dtime < 0 || dtime > 10.5f) return; - ccd_update_deflector_hash(eval_ctx->scene_layer, sb->collision_group, ob, sb->scratch->colliderhash); + ccd_update_deflector_hash(eval_ctx->view_layer, sb->collision_group, ob, sb->scratch->colliderhash); if (sb->scratch->needstobuildcollider) { - if (query_external_colliders(eval_ctx->scene_layer, sb->collision_group)) { - ccd_build_deflector_hash(eval_ctx->scene_layer, sb->collision_group, ob, sb->scratch->colliderhash); + if (query_external_colliders(eval_ctx->view_layer, sb->collision_group)) { + ccd_build_deflector_hash(eval_ctx->view_layer, sb->collision_group, ob, sb->scratch->colliderhash); } sb->scratch->needstobuildcollider=0; } diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 6cf310461c1..747ffdafe8b 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -886,8 +886,8 @@ void BKE_sound_update_scene(Main *bmain, Scene *scene) if (!BLI_listbase_is_empty(&bmain->speaker)) { BKE_main_id_tag_listbase(&bmain->object, LIB_TAG_DOIT, true); - for (SceneLayer *scene_layer = scene->render_layers.first; scene_layer; scene_layer = scene_layer->next) { - for (base = scene_layer->object_bases.first; base; base = base->next) { + for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { + for (base = view_layer->object_bases.first; base; base = base->next) { sound_update_base(scene, base, new_set); } } diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 6ebd8e6ae36..07e071df04a 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -401,7 +401,7 @@ void BKE_tracking_get_camera_object_matrix(Scene *scene, Object *ob, float mat[4 if (scene->camera) ob = scene->camera; else - ob = BKE_scene_layer_camera_find(BKE_scene_layer_from_scene_get(scene)); + ob = BKE_view_layer_camera_find(BKE_view_layer_from_scene_get(scene)); } if (ob) diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c index fec9d736e09..67639b4c7ab 100644 --- a/source/blender/blenkernel/intern/workspace.c +++ b/source/blender/blenkernel/intern/workspace.c @@ -401,13 +401,13 @@ ListBase *BKE_workspace_transform_orientations_get(WorkSpace *workspace) return &workspace->transform_orientations; } -SceneLayer *BKE_workspace_render_layer_get(const WorkSpace *workspace) +ViewLayer *BKE_workspace_view_layer_get(const WorkSpace *workspace) { - return workspace->render_layer; + return workspace->view_layer; } -void BKE_workspace_render_layer_set(WorkSpace *workspace, SceneLayer *layer) +void BKE_workspace_view_layer_set(WorkSpace *workspace, ViewLayer *layer) { - workspace->render_layer = layer; + workspace->view_layer = layer; } ListBase *BKE_workspace_layouts_get(WorkSpace *workspace) @@ -477,9 +477,9 @@ void BKE_workspace_update_tagged(struct EvaluationContext *eval_ctx, WorkSpace *workspace, Scene *scene) { - SceneLayer *scene_layer = BKE_workspace_render_layer_get(workspace); + ViewLayer *view_layer = BKE_workspace_view_layer_get(workspace); struct Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, - scene_layer, + view_layer, true); - BKE_scene_graph_update_tagged(eval_ctx, depsgraph, bmain, scene, scene_layer); + BKE_scene_graph_update_tagged(eval_ctx, depsgraph, bmain, scene, view_layer); } |