Merge branch 'master' into blender2.8

2018-05-09 14:37:25 +02:00 · 2018-05-09 14:37:25 +02:00 · 03abe89661
parent b73c7381cc 34c474e695
commit 03abe89661
1 changed files with 1 additions and 1 deletions
--- 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);
 }