Commit: a66d700fa73817493f838252f215963c5100b3e6
Author: Martin Felke
Date: Wed Oct 28 19:43:01 2015 +0100
Branches: fracture_modifier
https://developer.blender.org/rBa66d700fa73817493f838252f215963c5100b3e6
small fix for potentially unintended calculation
===================================================================
M source/blender/blenkernel/intern/rigidbody.c
===================================================================
diff --git a/source/blender/blenkernel/intern/rigidbody.c
b/source/blender/blenkernel/intern/rigidbody.c
index 07e1e64..80e0098 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -197,7 +197,7 @@ void BKE_rigidbody_calc_threshold(float max_con_mass,
FractureModifierData *rmd,
float min_mass = MIN2(con->mi1->rigidbody->mass,
con->mi2->rigidbody->mass);
float max_mass = MAX2(con->mi1->rigidbody->mass,
con->mi2->rigidbody->mass);
- thresh = (min_mass + (rmd->mass_threshold_factor *
max_mass) / min_mass + max_mass) * max_thresh;
+ thresh = ((min_mass + (rmd->mass_threshold_factor *
max_mass)) / (min_mass + max_mass)) * max_thresh;
}
else
{
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
