[Bf-blender-cvs] [5ee4cf0] temp_merge_gooseberry_hair: Fix for wind force function call.
Lukas Tönne
noreply at git.blender.org
Mon Jan 19 20:51:27 CET 2015
Commit: 5ee4cf0280168e6dff7cd85188fe18622ce637b3
Author: Lukas Tönne
Date: Mon Jan 19 20:20:03 2015 +0100
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rB5ee4cf0280168e6dff7cd85188fe18622ce637b3
Fix for wind force function call.
===================================================================
M source/blender/physics/intern/BPH_mass_spring.cpp
===================================================================
diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp
index 98a04de..e9bf376 100644
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@ -503,10 +503,9 @@ 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)
-
hair_ij = &hairdata[spring->ij];
hair_kl = &hairdata[spring->kl];
- BPH_mass_spring_force_edge_wind(data, si_ij, si_kl, hair_ij->radius, hair_kl->radius, winvec);
+ BPH_mass_spring_force_edge_wind(data, spring->ij, spring->kl, hair_ij->radius, hair_kl->radius, winvec);
}
}
More information about the Bf-blender-cvs
mailing list