Merge branch 'master' into blender2.8

[blender.git] / source / blender / blenloader / intern / versioning_270.c

diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index b7b6ace3c1a0973d416f279ffddf72338b5b94a0..d631e1507e34bc2dfcf1bd9c4754174d02d82bc2 100644 (file)
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -48,7 +48,6 @@
 #include "DNA_object_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"
-#include "DNA_particle_types.h"
 #include "DNA_linestyle_types.h"
 #include "DNA_actuator_types.h"
 #include "DNA_view3d_types.h"
@@ -424,22 +423,6 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
                }
        }
 
-       if (!MAIN_VERSION_ATLEAST(main, 271, 6)) {
-               Object *ob;
-               for (ob = main->object.first; ob; ob = ob->id.next) {
-                       ModifierData *md;
-
-                       for (md = ob->modifiers.first; md; md = md->next) {
-                               if (md->type == eModifierType_ParticleSystem) {
-                                       ParticleSystemModifierData *pmd = (ParticleSystemModifierData *)md;
-                                       if (pmd->psys && pmd->psys->clmd) {
-                                               pmd->psys->clmd->sim_parms->vel_damping = 1.0f;
-                                       }
-                               }
-                       }
-               }
-       }
-
        if (!MAIN_VERSION_ATLEAST(main, 272, 0)) {
                if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "int", "preview_start_resolution")) {
                        Scene *scene;
@@ -520,16 +503,6 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
                }
        }
        
-       if (!MAIN_VERSION_ATLEAST(main, 273, 3)) {
-               ParticleSettings *part;
-               for (part = main->particle.first; part; part = part->id.next) {
-                       if (part->clumpcurve)
-                               part->child_flag |= PART_CHILD_USE_CLUMP_CURVE;
-                       if (part->roughcurve)
-                               part->child_flag |= PART_CHILD_USE_ROUGH_CURVE;
-               }
-       }
-
        if (!MAIN_VERSION_ATLEAST(main, 273, 6)) {
                if (!DNA_struct_elem_find(fd->filesdna, "ClothSimSettings", "float", "bending_damping")) {
                        Object *ob;
@@ -540,39 +513,6 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
                                                ClothModifierData *clmd = (ClothModifierData *)md;
                                                clmd->sim_parms->bending_damping = 0.5f;
                                        }
-                                       else if (md->type == eModifierType_ParticleSystem) {
-                                               ParticleSystemModifierData *pmd = (ParticleSystemModifierData *)md;
-                                               if (pmd->psys->clmd) {
-                                                       pmd->psys->clmd->sim_parms->bending_damping = 0.5f;
-                                               }
-                                       }
-                               }
-                       }
-               }
-
-               if (!DNA_struct_elem_find(fd->filesdna, "ParticleSettings", "float", "clump_noise_size")) {
-                       ParticleSettings *part;
-                       for (part = main->particle.first; part; part = part->id.next) {
-                               part->clump_noise_size = 1.0f;
-                       }
-               }
-
-               if (!DNA_struct_elem_find(fd->filesdna, "ParticleSettings", "int", "kink_extra_steps")) {
-                       ParticleSettings *part;
-                       for (part = main->particle.first; part; part = part->id.next) {
-                               part->kink_extra_steps = 4;
-                       }
-               }
-
-               if (!DNA_struct_elem_find(fd->filesdna, "MTex", "float", "kinkampfac")) {
-                       ParticleSettings *part;
-                       for (part = main->particle.first; part; part = part->id.next) {
-                               int a;
-                               for (a = 0; a < MAX_MTEX; a++) {
-                                       MTex *mtex = part->mtex[a];
-                                       if (mtex) {
-                                               mtex->kinkampfac = 1.0f;
-                                       }
                                }
                        }
                }
@@ -659,19 +599,6 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
        }
 
        if (!MAIN_VERSION_ATLEAST(main, 274, 1)) {
-               /* particle systems need to be forced to redistribute for jitter mode fix */
-               {
-                       Object *ob;
-                       ParticleSystem *psys;
-                       for (ob = main->object.first; ob; ob = ob->id.next) {
-                               for (psys = ob->particlesystem.first; psys; psys = psys->next) {
-                                       if ((psys->pointcache->flag & PTCACHE_BAKED) == 0) {
-                                               psys->recalc |= PSYS_RECALC_RESET;
-                                       }
-                               }
-                       }
-               }
-
                /* hysteresis setted to 10% but not actived */
                if (!DNA_struct_elem_find(fd->filesdna, "LodLevel", "int", "obhysteresis")) {
                        Object *ob;
@@ -1066,15 +993,6 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
        }
 
        if (!MAIN_VERSION_ATLEAST(main, 277, 1)) {
-               for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
-                       ParticleEditSettings *pset = &scene->toolsettings->particle;
-                       for (int a = 0; a < PE_TOT_BRUSH; a++) {
-                               if (pset->brush[a].strength > 1.0f) {
-                                       pset->brush[a].strength *= 0.01f;
-                               }
-                       }
-               }
-
                /* init grease pencil smooth level iterations */
                for (bGPdata *gpd = main->gpencil.first; gpd; gpd = gpd->id.next) {
                        for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {