diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-02-02 16:23:35 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-02-02 16:23:35 +0300 |
commit | 92fdd1efdfaa07f55b678fb470d633bda0766f18 (patch) | |
tree | 681017dca24b16876147ab218f7f0cbce055c976 /source/blender/editors/physics/particle_edit.c | |
parent | 3637371c96625dbe127663edddfca0e1bd7037a3 (diff) | |
parent | 14755dde97333076d1d26e2fe3c83110b55e56cd (diff) |
Merge branch 'master' into gooseberry
Diffstat (limited to 'source/blender/editors/physics/particle_edit.c')
-rw-r--r-- | source/blender/editors/physics/particle_edit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 201252f26a4..b299a899000 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -3255,7 +3255,7 @@ static void brush_puff(PEData *data, int point_index) static void BKE_brush_weight_get(PEData *data, float UNUSED(mat[4][4]), float UNUSED(imat[4][4]), int point_index, int key_index, PTCacheEditKey *UNUSED(key)) { - /* roots have full weight allways */ + /* roots have full weight always */ if (key_index) { PTCacheEdit *edit = data->edit; ParticleSystem *psys = edit->psys; |