diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-09 10:04:17 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-09 10:04:17 +0400 |
| commit | dfdfa3d51b48a6bffd90779a1778dcf0e9a751e4 (patch) | |
| tree | f51a4ea8668ee41182a5d60942e96804004d3c7a /source/blender/blenkernel/intern/particle.c | |
| parent | 42517463821d0d0bbebe7c45bf40c06f4d8e9261 (diff) | |
code cleanup: replace macros VECCOPY, VECADD, VECSUB, INPR - with BLI_math funcs.
added copy float/double funcs: copy_v3fl_v3db(), copy_v3db_v3fl(). 2d & 4d too.
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index d86b3c7a9d3..590c307f549 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -2370,7 +2370,7 @@ void psys_find_parents(ParticleSimulationData *sim) BLI_kdtree_free(tree); } -static void get_strand_normal(Material *ma, float *surfnor, float surfdist, float *nor) +static void get_strand_normal(Material *ma, const float surfnor[3], float surfdist, float nor[3]) { float cross[3], nstrand[3], vnor[3], blend; @@ -2381,7 +2381,7 @@ static void get_strand_normal(Material *ma, float *surfnor, float surfdist, floa cross_v3_v3v3(cross, surfnor, nor); cross_v3_v3v3(nstrand, nor, cross); - blend= INPR(nstrand, surfnor); + blend = dot_v3v3(nstrand, surfnor); CLAMP(blend, 0.0f, 1.0f); interp_v3_v3v3(vnor, nstrand, surfnor, blend); |