diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-08-04 14:36:58 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-08-04 14:36:58 +0300 |
| commit | 5f621a12c6d14d6ec0439992bc0c2590a2bd4760 (patch) | |
| tree | 7143836d4095c1260f4afee06132ffd72ccabcaa /source/blender/blenkernel/BKE_particle.h | |
| parent | ca606bf55165881896467f6a5c09e5870c847fbb (diff) | |
| parent | 701a9d39175e0d3e5e2f776821f1251b8a7a5f78 (diff) | |
Merge branch 'blender-v2.90-release'
Conflicts:
source/blender/editors/gpencil/gpencil_primitive.c
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 3c0ec8147fe..02495496ee2 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -217,7 +217,7 @@ typedef struct ParticleCollision { /** Collision modifier for current object. */ struct CollisionModifierData *md; - /** Time factor of previous collision, needed for substracting face velocity. */ + /** Time factor of previous collision, needed for subtracting face velocity. */ float f; float fac1, fac2; |