Fixed merge errors.
authorLukas Tönne <lukas.toenne@gmail.com>
Tue, 20 Jan 2015 08:38:39 +0000 (09:38 +0100)
committerLukas Tönne <lukas.toenne@gmail.com>
Tue, 20 Jan 2015 08:38:39 +0000 (09:38 +0100)
source/blender/makesdna/DNA_particle_types.h
source/blender/physics/intern/BPH_mass_spring.cpp

index 04408196b56aba85e2ba689988ab5a17be02d7a6..95cb5c84bed1b11cdd806488ea34e02e400e81a6 100644 (file)
@@ -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;
 
index a77593d31a4527ffb257f0f9369234559b2ef120..c8e052c080e6b0062967fbd60033dd7299c6dbef 100644 (file)
@@ -120,8 +120,6 @@ void BKE_cloth_solver_set_positions(ClothModifierData *clmd)
        Implicit_Data *id = cloth->implicit;\r
        \r
        for (i = 0; i < numverts; i++) {\r
-               BPH_mass_spring_set_rest_transform(id, i, root->rot);\r
-               BPH_mass_spring_set_motion_state(id, i, verts[i].x, verts[i].v);\r
                if (cloth_hairdata) {\r
                        ClothHairData *root = &cloth_hairdata[i];\r
                        BPH_mass_spring_set_rest_transform(id, i, root->rot);\r
@@ -511,7 +509,7 @@ static void cloth_calc_force(ClothModifierData *clmd, float UNUSED(frame), ListB
                        \r
                        for (LinkNode *link = cloth->springs; link; link = link->next) {\r
                                ClothSpring *spring = (ClothSpring *)link->link;\r
-                               if (spring->type == CLOTH_SPRING_TYPE_STRUCTURAL)\r
+                               if (spring->type == CLOTH_SPRING_TYPE_STRUCTURAL) {\r
                                        if (hairdata) {\r
                                                hair_ij = &hairdata[spring->ij];\r
                                                hair_kl = &hairdata[spring->kl];\r
@@ -520,15 +518,12 @@ static void cloth_calc_force(ClothModifierData *clmd, float UNUSED(frame), ListB
                                        else\r
                                                BPH_mass_spring_force_edge_wind(data, spring->ij, spring->kl, 1.0f, 1.0f, winvec);\r
                                }\r
-               }\r
+                       }\r
 #else\r
                        ClothHairData *hairdata = clmd->hairdata;\r
                        \r
                        vert = cloth->verts;\r
                        for (i = 0; i < cloth->numverts; i++, vert++) {\r
-                               if (vert->solver_index < 0)\r
-                                       continue;\r
-                               \r
                                if (hairdata) {\r
                                        ClothHairData *hair = &hairdata[i];\r
                                        BPH_mass_spring_force_vertex_wind(data, i, hair->radius, winvec);\r
@@ -536,6 +531,7 @@ static void cloth_calc_force(ClothModifierData *clmd, float UNUSED(frame), ListB
                                else\r
                                        BPH_mass_spring_force_vertex_wind(data, i, 1.0f, winvec);\r
                        }\r
+               }\r
 #endif\r
 \r
                MEM_freeN(winvec);\r