diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2022-09-22 12:52:48 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2022-09-22 12:54:53 +0300 |
commit | 2db84a8ee7cd3873e11eb0c13abc09869caa0042 (patch) | |
tree | ea15209cc9742e23f36a7e692eb837723bfa64b3 /source/blender/blenkernel/BKE_particle.h | |
parent | a41ee7ea1ae9bb1bcc537576d9ffdb3bca3201f3 (diff) |
Fix all merge conflicts
There was a lot of conflicts and to solve, I refresh manually the source folders.
Diffstat (limited to 'source/blender/blenkernel/BKE_particle.h')
-rw-r--r-- | source/blender/blenkernel/BKE_particle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 5f8b2fafdd3..a797aef73f6 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -579,7 +579,7 @@ void psys_get_texture(struct ParticleSimulationData *sim, * Interpolate a location on a face based on face coordinates. */ void psys_interpolate_face(struct Mesh *mesh, - struct MVert *mvert, + const struct MVert *mvert, const float (*vert_normals)[3], struct MFace *mface, struct MTFace *tface, |