Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2020-11-06 17:37:56 +0300
committerJacques Lucke <jacques@blender.org>2020-11-06 17:37:56 +0300
commit958ceaf5bff22ca21b7b0aa7abbe10edfac991d0 (patch)
tree69b85a0b58933e993e9893418f48b81eb3b5dbd1 /source/blender/blenloader/intern/readfile.c
parent2f3181d0f2b426652738442ca59a6b61880e52d0 (diff)
Refactor: move Scene .blend expand to IDTypeInfo callback
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
-rw-r--r--source/blender/blenloader/intern/readfile.c109
1 files changed, 0 insertions, 109 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index c321424ea7c..29956b85db5 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5994,112 +5994,6 @@ static void expand_object(BlendExpander *expander, Object *ob)
}
}
-static void expand_scene(BlendExpander *expander, Scene *sce)
-{
- LISTBASE_FOREACH (Base *, base_legacy, &sce->base) {
- BLO_expand(expander, base_legacy->object);
- }
- BLO_expand(expander, sce->camera);
- BLO_expand(expander, sce->world);
-
- BKE_keyingsets_blend_read_expand(expander, &sce->keyingsets);
-
- if (sce->set) {
- BLO_expand(expander, sce->set);
- }
-
- LISTBASE_FOREACH (SceneRenderLayer *, srl, &sce->r.layers) {
- BLO_expand(expander, srl->mat_override);
- LISTBASE_FOREACH (FreestyleModuleConfig *, module, &srl->freestyleConfig.modules) {
- if (module->script) {
- BLO_expand(expander, module->script);
- }
- }
- LISTBASE_FOREACH (FreestyleLineSet *, lineset, &srl->freestyleConfig.linesets) {
- if (lineset->group) {
- BLO_expand(expander, lineset->group);
- }
- BLO_expand(expander, lineset->linestyle);
- }
- }
-
- LISTBASE_FOREACH (ViewLayer *, view_layer, &sce->view_layers) {
- IDP_BlendReadExpand(expander, view_layer->id_properties);
-
- LISTBASE_FOREACH (FreestyleModuleConfig *, module, &view_layer->freestyle_config.modules) {
- if (module->script) {
- BLO_expand(expander, module->script);
- }
- }
-
- LISTBASE_FOREACH (FreestyleLineSet *, lineset, &view_layer->freestyle_config.linesets) {
- if (lineset->group) {
- BLO_expand(expander, lineset->group);
- }
- BLO_expand(expander, lineset->linestyle);
- }
- }
-
- if (sce->gpd) {
- BLO_expand(expander, sce->gpd);
- }
-
- if (sce->ed) {
- Sequence *seq;
-
- SEQ_ALL_BEGIN (sce->ed, seq) {
- IDP_BlendReadExpand(expander, seq->prop);
-
- if (seq->scene) {
- BLO_expand(expander, seq->scene);
- }
- if (seq->scene_camera) {
- BLO_expand(expander, seq->scene_camera);
- }
- if (seq->clip) {
- BLO_expand(expander, seq->clip);
- }
- if (seq->mask) {
- BLO_expand(expander, seq->mask);
- }
- if (seq->sound) {
- BLO_expand(expander, seq->sound);
- }
-
- if (seq->type == SEQ_TYPE_TEXT && seq->effectdata) {
- TextVars *data = seq->effectdata;
- BLO_expand(expander, data->text_font);
- }
- }
- SEQ_ALL_END;
- }
-
- if (sce->rigidbody_world) {
- BLO_expand(expander, sce->rigidbody_world->group);
- BLO_expand(expander, sce->rigidbody_world->constraints);
- }
-
- LISTBASE_FOREACH (TimeMarker *, marker, &sce->markers) {
- IDP_BlendReadExpand(expander, marker->prop);
-
- if (marker->camera) {
- BLO_expand(expander, marker->camera);
- }
- }
-
- BLO_expand(expander, sce->clip);
-
-#ifdef USE_COLLECTION_COMPAT_28
- if (sce->collection) {
- BKE_collection_compat_blend_read_expand(expander, sce->collection);
- }
-#endif
-
- if (sce->r.bake.cage_object) {
- BLO_expand(expander, sce->r.bake.cage_object);
- }
-}
-
/**
* Set the callback func used over all ID data found by \a BLO_expand_main func.
*
@@ -6146,9 +6040,6 @@ void BLO_expand_main(void *fdhandle, Main *mainvar)
case ID_OB:
expand_object(&expander, (Object *)id);
break;
- case ID_SCE:
- expand_scene(&expander, (Scene *)id);
- break;
case ID_IP:
expand_ipo(&expander, (Ipo *)id); /* XXX deprecated - old animation system */
break;