diff options
author | Hans Goudey <h.goudey@me.com> | 2022-01-11 08:46:17 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-01-11 08:46:17 +0300 |
commit | 0c4ebbfc0e48cc268e9af0f24de6759be9cc36c9 (patch) | |
tree | 4f9fd7b913f1b21e82a8e74e46739456bacd6eaf /source/blender | |
parent | 7a0e8e1eb7eeec89051701e677fe9b5d7c6b2dea (diff) |
Fix typo that lead to problems in particle edit mode
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenlib/BLI_math_vector.h | 1 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_vector_inline.c | 7 | ||||
-rw-r--r-- | source/blender/editors/physics/particle_edit.c | 6 |
3 files changed, 3 insertions, 11 deletions
diff --git a/source/blender/blenlib/BLI_math_vector.h b/source/blender/blenlib/BLI_math_vector.h index 5e997d94acf..1ed8d4fc005 100644 --- a/source/blender/blenlib/BLI_math_vector.h +++ b/source/blender/blenlib/BLI_math_vector.h @@ -145,7 +145,6 @@ MINLINE void add_v4_v4(float r[4], const float a[4]); MINLINE void add_v4_v4v4(float r[4], const float a[4], const float b[4]); MINLINE void add_v3fl_v3fl_v3i(float r[3], const float a[3], const int b[3]); -MINLINE void add_v3fl_v3fl_v3s(float r[3], const float a[3], const short b[3]); MINLINE void sub_v2_v2(float r[2], const float a[2]); MINLINE void sub_v2_v2v2(float r[2], const float a[2], const float b[2]); diff --git a/source/blender/blenlib/intern/math_vector_inline.c b/source/blender/blenlib/intern/math_vector_inline.c index 648f876acaa..3022dbbe4ff 100644 --- a/source/blender/blenlib/intern/math_vector_inline.c +++ b/source/blender/blenlib/intern/math_vector_inline.c @@ -438,13 +438,6 @@ MINLINE void add_v3fl_v3fl_v3i(float r[3], const float a[3], const int b[3]) r[2] = a[2] + (float)b[2]; } -MINLINE void add_v3fl_v3fl_v3s(float r[3], const float a[3], const short b[3]) -{ - r[0] = a[0] + (float)b[0]; - r[1] = a[1] + (float)b[1]; - r[2] = a[2] + (float)b[2]; -} - MINLINE void add_v4_v4(float r[4], const float a[4]) { r[0] += a[0]; diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 5a2392aebba..ea35ad6dcd0 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -1475,16 +1475,16 @@ void recalc_emitter_field(Depsgraph *UNUSED(depsgraph), Object *UNUSED(ob), Part mvert = &mesh->mvert[mface->v2]; add_v3_v3v3(vec, vec, mvert->co); - copy_v3_v3(nor, vert_normals[mface->v2]); + add_v3_v3(nor, vert_normals[mface->v2]); mvert = &mesh->mvert[mface->v3]; add_v3_v3v3(vec, vec, mvert->co); - copy_v3_v3(nor, vert_normals[mface->v3]); + add_v3_v3(nor, vert_normals[mface->v3]); if (mface->v4) { mvert = &mesh->mvert[mface->v4]; add_v3_v3v3(vec, vec, mvert->co); - copy_v3_v3(nor, vert_normals[mface->v4]); + add_v3_v3(nor, vert_normals[mface->v4]); mul_v3_fl(vec, 0.25); } |