From 3abe8b3292cf7a50a9200b95401993384df24d9a Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Wed, 22 Nov 2017 10:52:39 -0200 Subject: Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927 --- .../editors/space_outliner/outliner_select.c | 62 +++++++++++----------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'source/blender/editors/space_outliner/outliner_select.c') diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index f2aec1cfa52..8267aeabe30 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -75,7 +75,7 @@ /* Outliner Element Selection/Activation on Click */ static eOLDrawState tree_element_active_renderlayer( - bContext *C, Scene *UNUSED(scene), SceneLayer *UNUSED(sl), TreeElement *te, TreeStoreElem *tselem, const eOLSetState set) + bContext *C, Scene *UNUSED(scene), ViewLayer *UNUSED(sl), TreeElement *te, TreeStoreElem *tselem, const eOLSetState set) { Scene *sce; @@ -85,11 +85,11 @@ static eOLDrawState tree_element_active_renderlayer( sce = (Scene *)tselem->id; if (set != OL_SETSEL_NONE) { - sce->active_layer = tselem->nr; + sce->active_view_layer = tselem->nr; WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, sce); } else { - return sce->active_layer == tselem->nr; + return sce->active_view_layer == tselem->nr; } return OL_DRAWSEL_NONE; } @@ -99,7 +99,7 @@ static eOLDrawState tree_element_active_renderlayer( * CTRL+LMB: Select/Deselect object and all cildren * CTRL+SHIFT+LMB: Add/Remove object and all children */ -static void do_outliner_object_select_recursive(SceneLayer *sl, Object *ob_parent, bool select) +static void do_outliner_object_select_recursive(ViewLayer *sl, Object *ob_parent, bool select) { Base *base; @@ -137,7 +137,7 @@ static void do_outliner_ebone_select_recursive(bArmature *arm, EditBone *ebone_p } static eOLDrawState tree_element_set_active_object( - bContext *C, Scene *scene, SceneLayer *sl, SpaceOops *soops, + bContext *C, Scene *scene, ViewLayer *sl, SpaceOops *soops, TreeElement *te, const eOLSetState set, bool recursive) { TreeStoreElem *tselem = TREESTORE(te); @@ -166,7 +166,7 @@ static eOLDrawState tree_element_set_active_object( } /* find associated base in current scene */ - base = BKE_scene_layer_base_find(sl, ob); + base = BKE_view_layer_base_find(sl, ob); if (base) { if (set == OL_SETSEL_EXTEND) { @@ -178,7 +178,7 @@ static eOLDrawState tree_element_set_active_object( } else { /* deleselect all */ - BKE_scene_layer_base_deselect_all(sl); + BKE_view_layer_base_deselect_all(sl); ED_object_base_select(base, BA_SELECT); } @@ -200,7 +200,7 @@ static eOLDrawState tree_element_set_active_object( } static eOLDrawState tree_element_active_material( - bContext *C, Scene *UNUSED(scene), SceneLayer *sl, SpaceOops *soops, + bContext *C, Scene *UNUSED(scene), ViewLayer *sl, SpaceOops *soops, TreeElement *te, const eOLSetState set) { TreeElement *tes; @@ -253,7 +253,7 @@ static eOLDrawState tree_element_active_material( } static eOLDrawState tree_element_active_texture( - bContext *C, Scene *scene, SceneLayer *sl, SpaceOops *UNUSED(soops), + bContext *C, Scene *scene, ViewLayer *sl, SpaceOops *UNUSED(soops), TreeElement *te, const eOLSetState set) { TreeElement *tep; @@ -340,7 +340,7 @@ static eOLDrawState tree_element_active_texture( static eOLDrawState tree_element_active_lamp( - bContext *UNUSED(C), Scene *UNUSED(scene), SceneLayer *sl, SpaceOops *soops, + bContext *UNUSED(C), Scene *UNUSED(scene), ViewLayer *sl, SpaceOops *soops, TreeElement *te, const eOLSetState set) { Object *ob; @@ -363,7 +363,7 @@ static eOLDrawState tree_element_active_lamp( } static eOLDrawState tree_element_active_camera( - bContext *UNUSED(C), Scene *scene, SceneLayer *UNUSED(sl), SpaceOops *soops, + bContext *UNUSED(C), Scene *scene, ViewLayer *UNUSED(sl), SpaceOops *soops, TreeElement *te, const eOLSetState set) { Object *ob = (Object *)outliner_search_back(soops, te, ID_OB); @@ -376,7 +376,7 @@ static eOLDrawState tree_element_active_camera( } static eOLDrawState tree_element_active_world( - bContext *C, Scene *scene, SceneLayer *UNUSED(sl), SpaceOops *UNUSED(soops), + bContext *C, Scene *scene, ViewLayer *UNUSED(sl), SpaceOops *UNUSED(soops), TreeElement *te, const eOLSetState set) { TreeElement *tep; @@ -409,7 +409,7 @@ static eOLDrawState tree_element_active_world( } static eOLDrawState tree_element_active_defgroup( - bContext *C, SceneLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set) + bContext *C, ViewLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set) { Object *ob; @@ -432,7 +432,7 @@ static eOLDrawState tree_element_active_defgroup( } static eOLDrawState tree_element_active_posegroup( - bContext *C, Scene *UNUSED(scene), SceneLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set) + bContext *C, Scene *UNUSED(scene), ViewLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set) { Object *ob = (Object *)tselem->id; @@ -453,7 +453,7 @@ static eOLDrawState tree_element_active_posegroup( } static eOLDrawState tree_element_active_posechannel( - bContext *C, Scene *UNUSED(scene), SceneLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive) + bContext *C, Scene *UNUSED(scene), ViewLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive) { Object *ob = (Object *)tselem->id; bArmature *arm = ob->data; @@ -497,7 +497,7 @@ static eOLDrawState tree_element_active_posechannel( } static eOLDrawState tree_element_active_bone( - bContext *C, SceneLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive) + bContext *C, ViewLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive) { bArmature *arm = (bArmature *)tselem->id; Bone *bone = te->directdata; @@ -606,7 +606,7 @@ static eOLDrawState tree_element_active_ebone( } static eOLDrawState tree_element_active_modifier( - bContext *C, Scene *UNUSED(scene), SceneLayer *UNUSED(sl), TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set) + bContext *C, Scene *UNUSED(scene), ViewLayer *UNUSED(sl), TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set) { if (set != OL_SETSEL_NONE) { Object *ob = (Object *)tselem->id; @@ -634,7 +634,7 @@ static eOLDrawState tree_element_active_psys( } static int tree_element_active_constraint( - bContext *C, Scene *UNUSED(scene), SceneLayer *UNUSED(sl), TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set) + bContext *C, Scene *UNUSED(scene), ViewLayer *UNUSED(sl), TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set) { if (set != OL_SETSEL_NONE) { Object *ob = (Object *)tselem->id; @@ -647,7 +647,7 @@ static int tree_element_active_constraint( } static eOLDrawState tree_element_active_text( - bContext *UNUSED(C), Scene *UNUSED(scene), SceneLayer *UNUSED(sl), SpaceOops *UNUSED(soops), + bContext *UNUSED(C), Scene *UNUSED(scene), ViewLayer *UNUSED(sl), SpaceOops *UNUSED(soops), TreeElement *UNUSED(te), int UNUSED(set)) { // XXX removed @@ -655,10 +655,10 @@ static eOLDrawState tree_element_active_text( } static eOLDrawState tree_element_active_pose( - bContext *C, Scene *scene, SceneLayer *sl, TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set) + bContext *C, Scene *scene, ViewLayer *sl, TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set) { Object *ob = (Object *)tselem->id; - Base *base = BKE_scene_layer_base_find(sl, ob); + Base *base = BKE_view_layer_base_find(sl, ob); if (base == NULL) { /* Armature not instantiated in current scene (e.g. inside an appended group...). */ @@ -744,7 +744,7 @@ static eOLDrawState tree_element_active_sequence_dup( } static eOLDrawState tree_element_active_keymap_item( - bContext *UNUSED(C), Scene *UNUSED(scene), SceneLayer *UNUSED(sl), TreeElement *te, TreeStoreElem *UNUSED(tselem), const eOLSetState set) + bContext *UNUSED(C), Scene *UNUSED(scene), ViewLayer *UNUSED(sl), TreeElement *te, TreeStoreElem *UNUSED(tselem), const eOLSetState set) { wmKeyMapItem *kmi = te->directdata; @@ -780,7 +780,7 @@ static eOLDrawState tree_element_active_collection( /* don't allow selecting a scene collection, it can have multiple layer collection * instances (which one would the user want to be selected then?) */ else if (tselem->type == TSE_LAYER_COLLECTION) { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); LayerCollection *lc = te->directdata; const int collection_index = BKE_layer_collection_findindex(sl, lc); @@ -795,7 +795,7 @@ static eOLDrawState tree_element_active_collection( /* ---------------------------------------------- */ /* generic call for ID data check or make/check active in UI */ -eOLDrawState tree_element_active(bContext *C, Scene *scene, SceneLayer *sl, SpaceOops *soops, TreeElement *te, +eOLDrawState tree_element_active(bContext *C, Scene *scene, ViewLayer *sl, SpaceOops *soops, TreeElement *te, const eOLSetState set, const bool handle_all_types) { switch (te->idcode) { @@ -826,7 +826,7 @@ eOLDrawState tree_element_active(bContext *C, Scene *scene, SceneLayer *sl, Spac * Generic call for non-id data to make/check active in UI */ eOLDrawState tree_element_type_active( - bContext *C, Scene *scene, SceneLayer *sl, SpaceOops *soops, + bContext *C, Scene *scene, ViewLayer *sl, SpaceOops *soops, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive) { switch (tselem->type) { @@ -883,7 +883,7 @@ eOLDrawState tree_element_type_active( * Needed to run from operators accessed from a menu. */ static void do_outliner_item_activate_tree_element( - bContext *C, Scene *scene, SceneLayer *sl, SpaceOops *soops, + bContext *C, Scene *scene, ViewLayer *sl, SpaceOops *soops, TreeElement *te, TreeStoreElem *tselem, const bool extend, const bool recursive) { @@ -918,14 +918,14 @@ static void do_outliner_item_activate_tree_element( } for (gob = gr->gobject.first; gob; gob = gob->next) { - ED_object_base_select(BKE_scene_layer_base_find(sl, gob->ob), sel); + ED_object_base_select(BKE_view_layer_base_find(sl, gob->ob), sel); } } else { - BKE_scene_layer_base_deselect_all(sl); + BKE_view_layer_base_deselect_all(sl); for (gob = gr->gobject.first; gob; gob = gob->next) { - Base *base = BKE_scene_layer_base_find(sl, gob->ob); + Base *base = BKE_view_layer_base_find(sl, gob->ob); /* Object may not be in this scene */ if (base != NULL) { if ((base->flag & BASE_SELECTED) == 0) { @@ -1004,7 +1004,7 @@ void outliner_item_do_activate_from_tree_element( bool extend, bool recursive) { Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); SpaceOops *soops = CTX_wm_space_outliner(C); do_outliner_item_activate_tree_element( @@ -1044,7 +1044,7 @@ int outliner_item_do_activate_from_cursor( } else { Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); /* the row may also contain children, if one is hovered we want this instead of current te */ TreeElement *activate_te = outliner_find_item_at_x_in_row(soops, te, view_mval[0]); TreeStoreElem *activate_tselem = TREESTORE(activate_te); -- cgit v1.2.3