diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2018-05-09 15:37:25 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2018-05-09 15:37:25 +0300 |
| commit | 03abe89661e0fe62cb08dd4313949a144386aa4b (patch) | |
| tree | 5dacc624d85314455751262afffa7ef199eefc59 /source/blender/editors/physics | |
| parent | b73c7381cc7e359c5baf17748340802e679cf549 (diff) | |
| parent | 34c474e695416bd07efae3502101ca549890c7bb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/physics')
| -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 78ee8939de5..fe749fd096e 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -2645,7 +2645,7 @@ void PARTICLE_OT_remove_doubles(wmOperatorType *ot) /* properties */ RNA_def_float(ot->srna, "threshold", 0.0002f, 0.0f, FLT_MAX, - "Merge Distance", "Threshold distance withing which particles are removed", 0.00001f, 0.1f); + "Merge Distance", "Threshold distance within which particles are removed", 0.00001f, 0.1f); } |