1 files changed, 0 insertions, 133 deletions

diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 4871dc2f161..d19ed0ad278 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -118,7 +118,6 @@
 #include "DNA_object_types.h"
 #include "DNA_object_force.h"
 #include "DNA_packedFile_types.h"
-#include "DNA_particle_types.h"
 #include "DNA_property_types.h"
 #include "DNA_rigidbody_types.h"
 #include "DNA_scene_types.h"
@@ -1059,40 +1058,6 @@ static void write_userdef(WriteData *wd)
 	}
 }
 
-static void write_boid_state(WriteData *wd, BoidState *state)
-{
-	BoidRule *rule = state->rules.first;
-	//BoidCondition *cond = state->conditions.first;
-
-	writestruct(wd, DATA, "BoidState", 1, state);
-
-	for (; rule; rule=rule->next) {
-		switch (rule->type) {
-			case eBoidRuleType_Goal:
-			case eBoidRuleType_Avoid:
-				writestruct(wd, DATA, "BoidRuleGoalAvoid", 1, rule);
-				break;
-			case eBoidRuleType_AvoidCollision:
-				writestruct(wd, DATA, "BoidRuleAvoidCollision", 1, rule);
-				break;
-			case eBoidRuleType_FollowLeader:
-				writestruct(wd, DATA, "BoidRuleFollowLeader", 1, rule);
-				break;
-			case eBoidRuleType_AverageSpeed:
-				writestruct(wd, DATA, "BoidRuleAverageSpeed", 1, rule);
-				break;
-			case eBoidRuleType_Fight:
-				writestruct(wd, DATA, "BoidRuleFight", 1, rule);
-				break;
-			default:
-				writestruct(wd, DATA, "BoidRule", 1, rule);
-				break;
-		}
-	}
-	//for (; cond; cond=cond->next)
-	//	writestruct(wd, DATA, "BoidCondition", 1, cond);
-}
-
 /* update this also to readfile.c */
 static const char *ptcache_data_struct[] = {
 	"", // BPHYS_DATA_INDEX
@@ -1143,102 +1108,6 @@ static void write_pointcaches(WriteData *wd, ListBase *ptcaches)
 		}
 	}
 }
-static void write_particlesettings(WriteData *wd, ListBase *idbase)
-{
-	ParticleSettings *part;
-	ParticleDupliWeight *dw;
-	GroupObject *go;
-	int a;
-
-	part= idbase->first;
-	while (part) {
-		if (part->id.us>0 || wd->current) {
-			/* write LibData */
-			writestruct(wd, ID_PA, "ParticleSettings", 1, part);
-			if (part->id.properties) IDP_WriteProperty(part->id.properties, wd);
-			if (part->adt) write_animdata(wd, part->adt);
-			writestruct(wd, DATA, "PartDeflect", 1, part->pd);
-			writestruct(wd, DATA, "PartDeflect", 1, part->pd2);
-			writestruct(wd, DATA, "EffectorWeights", 1, part->effector_weights);
-
-			if (part->clumpcurve)
-				write_curvemapping(wd, part->clumpcurve);
-			if (part->roughcurve)
-				write_curvemapping(wd, part->roughcurve);
-			
-			dw = part->dupliweights.first;
-			for (; dw; dw=dw->next) {
-				/* update indices */
-				dw->index = 0;
-				if (part->dup_group) { /* can be NULL if lining fails or set to None */
-					go = part->dup_group->gobject.first;
-					while (go && go->ob != dw->ob) {
-						go=go->next;
-						dw->index++;
-					}
-				}
-				writestruct(wd, DATA, "ParticleDupliWeight", 1, dw);
-			}
-
-			if (part->boids && part->phystype == PART_PHYS_BOIDS) {
-				BoidState *state = part->boids->states.first;
-
-				writestruct(wd, DATA, "BoidSettings", 1, part->boids);
-
-				for (; state; state=state->next)
-					write_boid_state(wd, state);
-			}
-			if (part->fluid && part->phystype == PART_PHYS_FLUID) {
-				writestruct(wd, DATA, "SPHFluidSettings", 1, part->fluid); 
-			}
-
-			for (a=0; a<MAX_MTEX; a++) {
-				if (part->mtex[a]) writestruct(wd, DATA, "MTex", 1, part->mtex[a]);
-			}
-		}
-		part= part->id.next;
-	}
-}
-static void write_particlesystems(WriteData *wd, ListBase *particles)
-{
-	ParticleSystem *psys= particles->first;
-	ParticleTarget *pt;
-	int a;
-
-	for (; psys; psys=psys->next) {
-		writestruct(wd, DATA, "ParticleSystem", 1, psys);
-
-		if (psys->particles) {
-			writestruct(wd, DATA, "ParticleData", psys->totpart, psys->particles);
-
-			if (psys->particles->hair) {
-				ParticleData *pa = psys->particles;
-
-				for (a=0; a<psys->totpart; a++, pa++)
-					writestruct(wd, DATA, "HairKey", pa->totkey, pa->hair);
-			}
-
-			if (psys->particles->boid && psys->part->phystype == PART_PHYS_BOIDS)
-				writestruct(wd, DATA, "BoidParticle", psys->totpart, psys->particles->boid);
-
-			if (psys->part->fluid && psys->part->phystype == PART_PHYS_FLUID && (psys->part->fluid->flag & SPH_VISCOELASTIC_SPRINGS))
-				writestruct(wd, DATA, "ParticleSpring", psys->tot_fluidsprings, psys->fluid_springs);
-		}
-		pt = psys->targets.first;
-		for (; pt; pt=pt->next)
-			writestruct(wd, DATA, "ParticleTarget", 1, pt);
-
-		if (psys->child) writestruct(wd, DATA, "ChildParticle", psys->totchild, psys->child);
-
-		if (psys->clmd) {
-			writestruct(wd, DATA, "ClothModifierData", 1, psys->clmd);
-			writestruct(wd, DATA, "ClothSimSettings", 1, psys->clmd->sim_parms);
-			writestruct(wd, DATA, "ClothCollSettings", 1, psys->clmd->coll_parms);
-		}
-
-		write_pointcaches(wd, &psys->ptcaches);
-	}
-}
 
 static void write_properties(WriteData *wd, ListBase *lb)
 {
@@ -1716,7 +1585,6 @@ static void write_objects(WriteData *wd, ListBase *idbase)
 				writestruct(wd, DATA, "ImageUser", 1, ob->iuser);
 			}
 
-			write_particlesystems(wd, &ob->particlesystem);
 			write_modifiers(wd, &ob->modifiers);
 
 			writelist(wd, DATA, "LinkData", &ob->pc_ids);
@@ -3749,7 +3617,6 @@ static int write_file_handle(
 	write_materials(wd, &mainvar->mat);
 	write_textures (wd, &mainvar->tex);
 	write_meshes   (wd, &mainvar->mesh);
-	write_particlesettings(wd, &mainvar->particle);
 	write_nodetrees(wd, &mainvar->nodetree);
 	write_brushes  (wd, &mainvar->brush);
 	write_palettes (wd, &mainvar->palettes);