diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-07 11:01:24 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-07 11:01:24 +0400 |
| commit | 7508540c53222c289a665cb0528e2a5c984b9b99 (patch) | |
| tree | 1fd3f92c4fd7ea74d23288468a1ce494350c33a7 /source/blender/editors/physics/particle_object.c | |
| parent | 261c1679b484884973d485c3f21bed9e87fa5260 (diff) | |
| parent | 4b3cc63f73cfe519689bdbd8482e655b72423038 (diff) | |
svn merge -r41575:41602 ^/trunk/blender
Diffstat (limited to 'source/blender/editors/physics/particle_object.c')
| -rw-r--r-- | source/blender/editors/physics/particle_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 7071e5d3720..dd46910fbc1 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -688,7 +688,7 @@ static void connect_hair(Scene *scene, Object *ob, ParticleSystem *psys) psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, pa, hairmat); invert_m4_m4(imat,hairmat); - VECSUB(vec, nearest.co, key->co); + sub_v3_v3v3(vec, nearest.co, key->co); if(point) { ekey = point->keys; @@ -696,7 +696,7 @@ static void connect_hair(Scene *scene, Object *ob, ParticleSystem *psys) } for(k=0,key=pa->hair; k<pa->totkey; k++,key++) { - VECADD(key->co, key->co, vec); + add_v3_v3(key->co, vec); mul_m4_v3(imat,key->co); if(ekey) { |