diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-13 11:49:39 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-13 11:49:39 +0300 |
commit | d47173c8caf6f713f1c2a36feb6cec657ce1182d (patch) | |
tree | 2c788d6d1d4914318e77c88b640d473dac34c774 /source/blender/blenloader/intern/versioning_250.c | |
parent | cf6cb3dcaf17f274ae8b6c151b8590611ae8c6c4 (diff) |
Removed blenkernel particle code.
Diffstat (limited to 'source/blender/blenloader/intern/versioning_250.c')
-rw-r--r-- | source/blender/blenloader/intern/versioning_250.c | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index 43ebab7856c..b3ac48cf0cb 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -78,7 +78,6 @@ #include "BKE_mesh.h" // for ME_ defines (patching) #include "BKE_modifier.h" #include "BKE_multires.h" -#include "BKE_particle.h" #include "BKE_pointcache.h" #include "BKE_screen.h" #include "BKE_sequencer.h" @@ -743,7 +742,6 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main) Curve *cu; Scene *sce; Tex *tx; - ParticleSettings *part; Object *ob; //PTCacheID *pid; //ListBase pidlist; @@ -874,25 +872,6 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main) me->drawflag = ME_DRAWEDGES|ME_DRAWFACES|ME_DRAWCREASES; } - /* particle draw and render types */ - for (part = main->particle.first; part; part = part->id.next) { - if (part->draw_as) { - if (part->draw_as == PART_DRAW_DOT) { - part->ren_as = PART_DRAW_HALO; - part->draw_as = PART_DRAW_REND; - } - else if (part->draw_as <= PART_DRAW_AXIS) { - part->ren_as = PART_DRAW_HALO; - } - else { - part->ren_as = part->draw_as; - part->draw_as = PART_DRAW_REND; - } - } - part->path_end = 1.0f; - part->clength = 1.0f; - } - /* set old pointcaches to have disk cache flag */ for (ob = main->object.first; ob; ob = ob->id.next) { @@ -1134,7 +1113,6 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main) Lamp *la; World *wo; Tex *tex; - ParticleSettings *part; bool do_gravity = false; for (sce = main->scene.first; sce; sce = sce->id.next) @@ -1195,12 +1173,6 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main) } } - /* Assign proper global gravity weights for dynamics (only z-coordinate is taken into account) */ - if (do_gravity) { - for (part = main->particle.first; part; part = part->id.next) - part->effector_weights->global_gravity = part->acc[2]/-9.81f; - } - for (ob = main->object.first; ob; ob = ob->id.next) { ModifierData *md; @@ -2193,7 +2165,6 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main) if (main->versionfile < 255 || (main->versionfile == 255 && main->subversionfile < 1)) { Brush *br; - ParticleSettings *part; bScreen *sc; Object *ob; @@ -2202,14 +2173,6 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main) br->ob_mode = OB_MODE_ALL_PAINT; } - for (part = main->particle.first; part; part = part->id.next) { - if (part->boids) - part->boids->pitch = 1.0f; - - part->flag &= ~PART_HAIR_REGROW; /* this was a deprecated flag before */ - part->kink_amp_clump = 1.f; /* keep old files looking similar */ - } - for (sc = main->screen.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { @@ -2427,7 +2390,6 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main) bScreen *sc; Brush *brush; Object *ob; - ParticleSettings *part; Material *mat; int tex_nr, transp_tex; @@ -2477,12 +2439,6 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main) } } } - - /* particle draw color from material */ - for (part = main->particle.first; part; part = part->id.next) { - if (part->draw & PART_DRAW_MAT_COL) - part->draw_col = PART_DRAW_COL_MAT; - } } if (main->versionfile < 256 || (main->versionfile == 256 && main->subversionfile < 6)) { @@ -2575,14 +2531,6 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main) } } } - - { - ParticleSettings *part; - for (part = main->particle.first; part; part = part->id.next) { - /* Initialize particle billboard scale */ - part->bb_size[0] = part->bb_size[1] = 1.0f; - } - } } if (main->versionfile < 259 || (main->versionfile == 259 && main->subversionfile < 1)) { @@ -2751,15 +2699,6 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main) if (main->versionfile < 259 || (main->versionfile == 259 && main->subversionfile < 4)) { { - /* Adaptive time step for particle systems */ - ParticleSettings *part; - for (part = main->particle.first; part; part = part->id.next) { - part->courant_target = 0.2f; - part->time_flag &= ~PART_TIME_AUTOSF; - } - } - - { /* set defaults for obstacle avoidance, recast data */ Scene *sce; for (sce = main->scene.first; sce; sce = sce->id.next) { |