Changeset View
Changeset View
Standalone View
Standalone View
source/blender/editors/space_outliner/space_outliner.c
| Show First 20 Lines • Show All 120 Lines • ▼ Show 20 Lines | if (GS(id->name) == ID_OB) { | ||||
| /* currently outliner organized in a way that if there's no parent scene | /* currently outliner organized in a way that if there's no parent scene | ||||
| * element for object it means that all displayed objects belong to | * element for object it means that all displayed objects belong to | ||||
| * active scene and parenting them is allowed (sergey) | * active scene and parenting them is allowed (sergey) | ||||
| */ | */ | ||||
| if (!scene) { | if (!scene) { | ||||
| return 1; | return 1; | ||||
| } else { | } else { | ||||
| for (SceneLayer *scene_layer = scene->render_layers.first; | for (ViewLayer *view_layer = scene->view_layers.first; | ||||
| scene_layer; | view_layer; | ||||
| scene_layer = scene_layer->next) | view_layer = view_layer->next) | ||||
| { | { | ||||
| if (BKE_scene_layer_base_find(scene_layer, (Object *)id)) { | if (BKE_view_layer_base_find(view_layer, (Object *)id)) { | ||||
| return 1; | return 1; | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| else if (ELEM(tselem->type, TSE_LAYER_COLLECTION, TSE_SCENE_COLLECTION)) { | else if (ELEM(tselem->type, TSE_LAYER_COLLECTION, TSE_SCENE_COLLECTION)) { | ||||
| /* support adding object from different scene to collection */ | /* support adding object from different scene to collection */ | ||||
| return 1; | return 1; | ||||
| ▲ Show 20 Lines • Show All 453 Lines • Show Last 20 Lines | |||||