diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-10 02:47:43 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-10 02:59:12 +0300 |
| commit | 1d6b99b157c40810cda903f455a4fa0720434674 (patch) | |
| tree | 385c2749eec384800c4b85ef0d09b2311a468f14 /source/blender/windowmanager | |
| parent | 7cb65cc03833f1bda969a55f68983c542691be02 (diff) | |
Cleanup: don't abbreviate color w/ manipulator API
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/manipulators/WM_manipulator_api.h | 8 | ||||
| -rw-r--r-- | source/blender/windowmanager/manipulators/intern/wm_manipulator.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_api.h b/source/blender/windowmanager/manipulators/WM_manipulator_api.h index 93ba8f4f762..2939070db01 100644 --- a/source/blender/windowmanager/manipulators/WM_manipulator_api.h +++ b/source/blender/windowmanager/manipulators/WM_manipulator_api.h @@ -97,10 +97,10 @@ void WM_manipulator_set_flag(struct wmManipulator *mpr, const int flag, const bo void WM_manipulator_set_scale(struct wmManipulator *mpr, float scale); void WM_manipulator_set_line_width(struct wmManipulator *mpr, const float line_width); -void WM_manipulator_get_color(const struct wmManipulator *mpr, float col[4]); -void WM_manipulator_set_color(struct wmManipulator *mpr, const float col[4]); -void WM_manipulator_get_color_highlight(const struct wmManipulator *mpr, float col_hi[4]); -void WM_manipulator_set_color_highlight(struct wmManipulator *mpr, const float col[4]); +void WM_manipulator_get_color(const struct wmManipulator *mpr, float color[4]); +void WM_manipulator_set_color(struct wmManipulator *mpr, const float color[4]); +void WM_manipulator_get_color_highlight(const struct wmManipulator *mpr, float color_hi[4]); +void WM_manipulator_set_color_highlight(struct wmManipulator *mpr, const float color[4]); /** * Leaving values NULL use values from #wmManipulator. diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c index ba2146768ed..ccb6a39350f 100644 --- a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c +++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c @@ -336,13 +336,13 @@ void WM_manipulator_set_line_width(wmManipulator *mpr, const float line_width) * \param col Normal state color. * \param col_hi Highlighted state color. */ -void WM_manipulator_get_color(const wmManipulator *mpr, float col[4]) +void WM_manipulator_get_color(const wmManipulator *mpr, float color[4]) { - copy_v4_v4(col, mpr->color); + copy_v4_v4(color, mpr->color); } -void WM_manipulator_set_color(wmManipulator *mpr, const float col[4]) +void WM_manipulator_set_color(wmManipulator *mpr, const float color[4]) { - copy_v4_v4(mpr->color, col); + copy_v4_v4(mpr->color, color); } void WM_manipulator_get_color_highlight(const wmManipulator *mpr, float color_hi[4]) |