diff options
| author | Mariano Javier Suligoy <marianognu.easyrpg@gmail.com> | 2015-08-30 19:39:36 -0300 |
|---|---|---|
| committer | Mariano Javier Suligoy <marianognu.easyrpg@gmail.com> | 2015-08-30 19:39:36 -0300 |
| commit | 553edf1f250f34ca0ef0703b13b4d601f609e491 (patch) | |
| tree | 54e7cbf1ed368a872441ef6efc2fa2c027c45c89 /scene/gui | |
| parent | 680402cebf63066abcc93e7e8035e457c6305874 (diff) | |
| parent | 2d8866574dd2c06ac03e7055642b917a0a3c6dac (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
# Solved Conflicts:
# scene/gui/spin_box.cpp
# scene/gui/tree.cpp
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/spin_box.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/tree.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/spin_box.cpp b/scene/gui/spin_box.cpp index aa20bc6f22..a48136f541 100644 --- a/scene/gui/spin_box.cpp +++ b/scene/gui/spin_box.cpp @@ -125,7 +125,7 @@ void SpinBox::_input_event(const InputEvent& p_event) { if (drag.enabled) { float diff_y = drag.mouse_pos.y - cpos.y; - diff_y=pow((float)ABS(diff_y),(float)1.8)*SGN(diff_y); + diff_y=Math::pow(ABS(diff_y),1.8)*SGN(diff_y); diff_y*=0.1; drag.mouse_pos=cpos; diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 7941ff3614..5df6f2ced9 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -2070,7 +2070,7 @@ void Tree::_input_event(InputEvent p_event) { TreeItem::Cell &c=popup_edited_item->cells[popup_edited_item_col]; float diff_y = -b.relative_y; - diff_y=pow((float)ABS(diff_y),(float)1.8)*SGN(diff_y); + diff_y=Math::pow(ABS(diff_y),1.8)*SGN(diff_y); diff_y*=0.1; range_drag_base=CLAMP(range_drag_base + c.step * diff_y, c.min, c.max); |