diff options
author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2018-02-24 16:02:50 +0300 |
---|---|---|
committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2018-02-24 16:02:50 +0300 |
commit | 94eb1897523d4cf464ea0cdf90ccbd7db90f997d (patch) | |
tree | bcb82d0c8360f195046ab93b1a222acf0ad0f4f1 /source/blender/blenloader | |
parent | c4abb331027ab294618c5ab49d3f9d2dfc67596f (diff) | |
parent | 4403ca80bda690c0ac44e4a6db0cddf4b2428006 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/BKE_blender_version.h
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/versioning_270.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c index 044c47847be..bd4e4c2e35c 100644 --- a/source/blender/blenloader/intern/versioning_270.c +++ b/source/blender/blenloader/intern/versioning_270.c @@ -1756,6 +1756,24 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main) } } + if (!MAIN_VERSION_ATLEAST(main, 279, 3)) { + if (!DNA_struct_elem_find(fd->filesdna, "SmokeDomainSettings", "float", "clipping")) { + Object *ob; + ModifierData *md; + + for (ob = main->object.first; ob; ob = ob->id.next) { + for (md = ob->modifiers.first; md; md = md->next) { + if (md->type == eModifierType_Smoke) { + SmokeModifierData *smd = (SmokeModifierData *)md; + if (smd->domain) { + smd->domain->clipping = 1e-3f; + } + } + } + } + } + } + { /* Fix for invalid state of screen due to bug in older versions. */ for (bScreen *sc = main->screen.first; sc; sc = sc->id.next) { |