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:
authorYimingWu <xp8110@outlook.com>2021-07-31 04:27:30 +0300
committerYimingWu <xp8110@outlook.com>2021-07-31 04:29:39 +0300
commitd91c266986ded678bdc3ef83d69fbe456a23ef80 (patch)
tree0c2f95d615f021c47ff34c81da917e7ea4811aa7 /source/blender/blenloader
parente9dc6a0e09828453bb41a1990738d3a4deb1b130 (diff)
LineArt: Material flag versioning correction.
By the patch made it in master the version value already advanced (see https://developer.blender.org/D11839), so this versioning code needs to be moved down to that point.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/versioning_300.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index 95440f78cd2..9aec18ea279 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -583,11 +583,6 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
sizeof(scene->master_collection->id.name) - 2);
}
}
- LISTBASE_FOREACH (Material *, mat, &bmain->materials) {
- if (!(mat->lineart.flags & LRT_MATERIAL_CUSTOM_OCCLUSION_EFFECTIVENESS)) {
- mat->lineart.mat_occlusion = 1;
- }
- }
}
if (!MAIN_VERSION_ATLEAST(bmain, 300, 9)) {
@@ -618,6 +613,11 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
tool_settings->snap_uv_mode &= ~(1 << 4);
}
}
+ LISTBASE_FOREACH (Material *, mat, &bmain->materials) {
+ if (!(mat->lineart.flags & LRT_MATERIAL_CUSTOM_OCCLUSION_EFFECTIVENESS)) {
+ mat->lineart.mat_occlusion = 1;
+ }
+ }
}
if (!MAIN_VERSION_ATLEAST(bmain, 300, 13)) {