[Bf-blender-cvs] [b22a387] master: Fixed merge errors.

[Lukas Tönne]

Commit: b22a38786df7c3c7a785393bcca03f6b3b7c620a
Author: Lukas Tönne
Date:   Tue Jan 20 09:38:39 2015 +0100
Branches: master
https://developer.blender.org/rBb22a38786df7c3c7a785393bcca03f6b3b7c620a

Fixed merge errors.

===================================================================

M	source/blender/makesdna/DNA_particle_types.h
M	source/blender/physics/intern/BPH_mass_spring.cpp

===================================================================

diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index 0440819..95cb5c8 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -218,7 +218,7 @@ typedef struct ParticleSettings {
 	/* kink */
 	float kink_amp, kink_freq, kink_shape, kink_flat;
 	float kink_amp_clump;
-	int kink_extra_steps, pad;
+	int kink_extra_steps, pad4;
 	float kink_axis_random, kink_amp_random;
 	/* rough */
 	float rough1, rough1_size;
@@ -257,7 +257,7 @@ typedef struct ParticleSettings {
 
 	/* modified dm support */
 	short use_modifier_stack;
-	short pad[3];
+	short pad5[3];
 
 } ParticleSettings;
 
diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp
index a77593d..c8e052c 100644
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@ -120,8 +120,6 @@ void BKE_cloth_solver_set_positions(ClothModifierData *clmd)
 	Implicit_Data *id = cloth->implicit;
 	
 	for (i = 0; i < numverts; i++) {
-		BPH_mass_spring_set_rest_transform(id, i, root->rot);
-		BPH_mass_spring_set_motion_state(id, i, verts[i].x, verts[i].v);
 		if (cloth_hairdata) {
 			ClothHairData *root = &cloth_hairdata[i];
 			BPH_mass_spring_set_rest_transform(id, i, root->rot);
@@ -511,7 +509,7 @@ static void cloth_calc_force(ClothModifierData *clmd, float UNUSED(frame), ListB
 			
 			for (LinkNode *link = cloth->springs; link; link = link->next) {
 				ClothSpring *spring = (ClothSpring *)link->link;
-				if (spring->type == CLOTH_SPRING_TYPE_STRUCTURAL)
+				if (spring->type == CLOTH_SPRING_TYPE_STRUCTURAL) {
 					if (hairdata) {
 						hair_ij = &hairdata[spring->ij];
 						hair_kl = &hairdata[spring->kl];
@@ -520,15 +518,12 @@ static void cloth_calc_force(ClothModifierData *clmd, float UNUSED(frame), ListB
 					else
 						BPH_mass_spring_force_edge_wind(data, spring->ij, spring->kl, 1.0f, 1.0f, winvec);
 				}
-		}
+			}
 #else
 			ClothHairData *hairdata = clmd->hairdata;
 			
 			vert = cloth->verts;
 			for (i = 0; i < cloth->numverts; i++, vert++) {
-				if (vert->solver_index < 0)
-					continue;
-				
 				if (hairdata) {
 					ClothHairData *hair = &hairdata[i];
 					BPH_mass_spring_force_vertex_wind(data, i, hair->radius, winvec);
@@ -536,6 +531,7 @@ static void cloth_calc_force(ClothModifierData *clmd, float UNUSED(frame), ListB
 				else
 					BPH_mass_spring_force_vertex_wind(data, i, 1.0f, winvec);
 			}
+		}
 #endif
 
 		MEM_freeN(winvec);