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-08-21 16:24:36 +0300
committerJacques Lucke <jacques@blender.org>2020-08-21 16:24:36 +0300
commit71634d94ca4ce2b838206144089010a16bb3f1ff (patch)
tree085db53d88e896ef2243c6d8d18fda47f5d331f8 /source/blender/blenloader/intern
parent79d678e677a04c886cc7caa2b7aa30308082c462 (diff)
Cleanup: remove LodLevel
This was part of the game engine and is not used anymore. Reviewers: brecht Differential Revision: https://developer.blender.org/D8666
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r--source/blender/blenloader/intern/readfile.c19
-rw-r--r--source/blender/blenloader/intern/versioning_270.c11
-rw-r--r--source/blender/blenloader/intern/writefile.c1
3 files changed, 0 insertions, 31 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index c9a0a7a16ab..a5e20a56475 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4669,16 +4669,6 @@ static void lib_link_object(BlendLibReader *reader, Object *ob)
BLO_read_id_address(reader, ob->id.lib, &ob->rigidbody_constraint->ob2);
}
- {
- LISTBASE_FOREACH (LodLevel *, level, &ob->lodlevels) {
- BLO_read_id_address(reader, ob->id.lib, &level->source);
-
- if (!level->source && level == ob->lodlevels.first) {
- level->source = ob;
- }
- }
- }
-
if (warn) {
BKE_report(reader->fd->reports, RPT_WARNING, "Warning in console");
}
@@ -5343,9 +5333,6 @@ static void direct_link_object(BlendDataReader *reader, Object *ob)
}
}
- BLO_read_list(reader, &ob->lodlevels);
- ob->currentlod = ob->lodlevels.first;
-
ob->preview = direct_link_preview_image(reader, ob->preview);
}
@@ -10240,12 +10227,6 @@ static void expand_object(BlendExpander *expander, Object *ob)
BLO_expand(expander, ob->rigidbody_constraint->ob1);
BLO_expand(expander, ob->rigidbody_constraint->ob2);
}
-
- if (ob->currentlod) {
- LISTBASE_FOREACH (LodLevel *, level, &ob->lodlevels) {
- BLO_expand(expander, level->source);
- }
- }
}
#ifdef USE_COLLECTION_COMPAT_28
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index b19c6221391..e6b2266e1eb 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -891,17 +891,6 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
}
}
-
- /* hysteresis set to 10% but not activated */
- if (!DNA_struct_elem_find(fd->filesdna, "LodLevel", "int", "obhysteresis")) {
- Object *ob;
- for (ob = bmain->objects.first; ob; ob = ob->id.next) {
- LodLevel *level;
- for (level = ob->lodlevels.first; level; level = level->next) {
- level->obhysteresis = 10;
- }
- }
- }
}
if (!MAIN_VERSION_ATLEAST(bmain, 274, 4)) {
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index f5cb421920a..1c6c70bab6d 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1693,7 +1693,6 @@ static void write_object(BlendWriter *writer, Object *ob, const void *id_address
write_shaderfxs(writer, &ob->shader_fx);
BLO_write_struct_list(writer, LinkData, &ob->pc_ids);
- BLO_write_struct_list(writer, LodLevel, &ob->lodlevels);
write_previews(writer, ob->preview);
}