diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-19 21:59:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-19 21:59:30 +0400 |
| commit | 51488283564273c5e796d5ca3ded47f2726330e8 (patch) | |
| tree | a6149b89048c7827e7f762e469050dd8d94e7d50 /source/blender/editors/physics | |
| parent | 85d99737b5753fd845c3fce0f08e6b5205530195 (diff) | |
| parent | 5cd85ed57ea649c58c7c19d709bfc4cae7fffcad (diff) | |
svn merge ^/trunk/blender -r44235:44250
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 9929de8e89c..5648bc69099 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -3474,7 +3474,7 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr) view3d_operator_needs_opengl(C); selected= (short)count_selected_keys(scene, edit); - dmax = MAX2(fabs(dx), fabs(dy)); + dmax = maxf(fabsf(dx), fabsf(dy)); tot_steps = dmax/(0.2f * brush->size) + 1; dx /= (float)tot_steps; |