[Bf-blender-cvs] [4a7e464] temp_merge_gooseberry_hair: Minor fix when gravity code is disabled.
Lukas Tönne
noreply at git.blender.org
Mon Jan 19 20:49:12 CET 2015
Commit: 4a7e46444d5539450c98541d73f5339998caa6c3
Author: Lukas Tönne
Date: Mon Sep 15 17:41:53 2014 +0200
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rB4a7e46444d5539450c98541d73f5339998caa6c3
Minor fix when gravity code is disabled.
===================================================================
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 974fe67..1c45e1e 100644
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@ -407,8 +407,6 @@ static void cloth_calc_force(ClothModifierData *clmd, float UNUSED(frame), ListB
mul_v3_v3fl(gravity, clmd->scene->physics_settings.gravity, 0.001f * clmd->sim_parms->effector_weights->global_gravity);
}
BPH_mass_spring_force_gravity(data, gravity);
-#else
- zero_lfvector(lF, numverts);
#endif
// XXX TODO
More information about the Bf-blender-cvs
mailing list