Commit: cff176df37168142d18041a0cd78e80014d99b61
Author: Campbell Barton
Date: Wed Jun 7 22:12:32 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBcff176df37168142d18041a0cd78e80014d99b61
Minor manipulator API changes
Sync up with custom-manipulator branch
===================================================================
M source/blender/editors/transform/transform_manipulator.c
M source/blender/windowmanager/manipulators/WM_manipulator_api.h
M source/blender/windowmanager/manipulators/intern/wm_manipulator.c
===================================================================
diff --git a/source/blender/editors/transform/transform_manipulator.c
b/source/blender/editors/transform/transform_manipulator.c
index ec2bb0893ee..d1c8c08ec88 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -1314,7 +1314,8 @@ static void WIDGETGROUP_manipulator_draw_prepare(const
bContext *C, wmManipulato
float col[4], col_hi[4];
manipulator_get_axis_color(axis_idx, idot, col, col_hi);
- WM_manipulator_set_colors(axis, col, col_hi);
+ WM_manipulator_set_color(axis, col);
+ WM_manipulator_set_color_highlight(axis, col_hi);
switch (axis_idx) {
case MAN_AXIS_TRANS_C:
diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_api.h
b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
index 76053ed48e0..bffd7607fd0 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_api.h
+++ b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
@@ -78,8 +78,11 @@ void WM_manipulator_set_offset(struct wmManipulator
*manipulator, const float of
void WM_manipulator_set_flag(struct wmManipulator *manipulator, const int
flag, const bool enable);
void WM_manipulator_set_scale(struct wmManipulator *manipulator, float scale);
void WM_manipulator_set_line_width(struct wmManipulator *manipulator, const
float line_width);
-void WM_manipulator_set_colors(struct wmManipulator *manipulator, const float
col[4], const float col_hi[4]);
+void WM_manipulator_get_color(const struct wmManipulator *manipulator, float
col[4]);
+void WM_manipulator_set_color(struct wmManipulator *manipulator, const float
col[4]);
+void WM_manipulator_get_color_highlight(const struct wmManipulator
*manipulator, float col_hi[4]);
+void WM_manipulator_set_color_highlight(struct wmManipulator *manipulator,
const float col[4]);
/* -------------------------------------------------------------------- */
/* wmManipulatorGroup */
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
index 7b755cace36..2537f02ba3b 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
@@ -316,11 +316,25 @@ void WM_manipulator_set_line_width(wmManipulator
*manipulator, const float line_
* \param col Normal state color.
* \param col_hi Highlighted state color.
*/
-void WM_manipulator_set_colors(wmManipulator *manipulator, const float col[4],
const float col_hi[4])
+void WM_manipulator_get_color(const wmManipulator *manipulator, float col[4])
+{
+ copy_v4_v4(col, manipulator->col);
+}
+void WM_manipulator_set_color(wmManipulator *manipulator, const float col[4])
{
copy_v4_v4(manipulator->col, col);
+}
+
+void WM_manipulator_get_color_highlight(const wmManipulator *manipulator,
float col_hi[4])
+{
+ copy_v4_v4(col_hi, manipulator->col_hi);
+}
+void WM_manipulator_set_color_highlight(wmManipulator *manipulator, const
float col_hi[4])
+{
copy_v4_v4(manipulator->col_hi, col_hi);
}
+
+
/** \} */ // Manipulator Creation API
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
