[Bf-blender-cvs] [d8c402b] hair_system: minor fix to debug display.
Antony Riakiotakis
noreply at git.blender.org
Wed Aug 20 15:10:46 CEST 2014
Commit: d8c402bb26dd345a3958376c52c9f490eda73a27
Author: Antony Riakiotakis
Date: Wed Aug 20 15:10:36 2014 +0200
Branches: hair_system
https://developer.blender.org/rBd8c402bb26dd345a3958376c52c9f490eda73a27
minor fix to debug display.
===================================================================
M source/blender/hair/intern/HAIR_solver.cpp
===================================================================
diff --git a/source/blender/hair/intern/HAIR_solver.cpp b/source/blender/hair/intern/HAIR_solver.cpp
index 67d1af8..c91d440 100644
--- a/source/blender/hair/intern/HAIR_solver.cpp
+++ b/source/blender/hair/intern/HAIR_solver.cpp
@@ -358,6 +358,8 @@ static void calc_forces(const HairParams ¶ms, const SolverForces &forces, fl
}
Curve *curve = data.curves;
+ int k_tot = 0;
+
for (int i = 0; i < data.totcurves; ++i, ++curve) {
int numpoints = curve->totpoints;
@@ -387,6 +389,7 @@ static void calc_forces(const HairParams ¶ms, const SolverForces &forces, fl
acc_prev = intern_force_next;
++k;
++point;
+ ++k_tot;
}
/* Integrate free points */
@@ -397,10 +400,11 @@ static void calc_forces(const HairParams ¶ms, const SolverForces &forces, fl
point->force_accum = point->force_accum + intern_force + extern_force + acc_prev;
- Debug::point(data.debug_data, k, point->cur.co, point->rest_bend, frame_iter.frame());
+ Debug::point(data.debug_data, k_tot, point->cur.co, point->rest_bend, frame_iter.frame());
frame_iter.next();
acc_prev = intern_force_next;
+ k_tot++;
}
}
More information about the Bf-blender-cvs
mailing list