Commit: e073bb66bd88a2605e291b7c6e79824cd8905f66
Author: Campbell Barton
Date: Wed Jun 14 16:26:18 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rBe073bb66bd88a2605e291b7c6e79824cd8905f66
Cleanup: rename callbacks
===================================================================
M source/blender/editors/manipulator_library/arrow3d_manipulator.c
M source/blender/editors/manipulator_library/dial3d_manipulator.c
M source/blender/editors/manipulator_library/facemap3d_manipulator.c
M source/blender/editors/manipulator_library/primitive3d_manipulator.c
===================================================================
diff --git a/source/blender/editors/manipulator_library/arrow3d_manipulator.c
b/source/blender/editors/manipulator_library/arrow3d_manipulator.c
index fc7c72ea612..b4c8f0498c8 100644
--- a/source/blender/editors/manipulator_library/arrow3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/arrow3d_manipulator.c
@@ -89,7 +89,7 @@ typedef struct ArrowManipulator3D {
/* -------------------------------------------------------------------- */
-static void manipulator_arrow_get_final_pos(wmManipulator *mpr, float r_pos[3])
+static void manipulator_arrow_position_get(wmManipulator *mpr, float r_pos[3])
{
ArrowManipulator3D *arrow = (ArrowManipulator3D *)mpr;
@@ -193,7 +193,7 @@ static void arrow_draw_intern(ArrowManipulator3D *arrow,
const bool select, cons
float final_pos[3];
manipulator_color_get(&arrow->manipulator, highlight, col);
- manipulator_arrow_get_final_pos(&arrow->manipulator, final_pos);
+ manipulator_arrow_position_get(&arrow->manipulator, final_pos);
if (arrow->flag & ARROW_UP_VECTOR_SET) {
copy_v3_v3(rot[2], arrow->direction);
@@ -237,7 +237,7 @@ static void arrow_draw_intern(ArrowManipulator3D *arrow,
const bool select, cons
}
}
-static void manipulator_arrow_render_3d_intersect(
+static void manipulator_arrow_draw_select(
const bContext *UNUSED(C), wmManipulator *mpr,
int selectionbase)
{
@@ -387,7 +387,7 @@ static void manipulator_arrow_invoke(
inter->init_scale = mpr->scale;
- manipulator_arrow_get_final_pos(mpr, inter->init_origin);
+ manipulator_arrow_position_get(mpr, inter->init_origin);
mpr->interaction_data = inter;
}
@@ -531,8 +531,8 @@ static void MANIPULATOR_WT_arrow_3d(wmManipulatorType *wt)
/* api callbacks */
wt->draw = manipulator_arrow_draw;
- wt->draw_select = manipulator_arrow_render_3d_intersect;
- wt->position_get = manipulator_arrow_get_final_pos;
+ wt->draw_select = manipulator_arrow_draw_select;
+ wt->position_get = manipulator_arrow_position_get;
wt->modal = manipulator_arrow_modal;
wt->invoke = manipulator_arrow_invoke;
wt->property_update = manipulator_arrow_property_update;
diff --git a/source/blender/editors/manipulator_library/dial3d_manipulator.c
b/source/blender/editors/manipulator_library/dial3d_manipulator.c
index 828ca6626ae..7c26beafaac 100644
--- a/source/blender/editors/manipulator_library/dial3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/dial3d_manipulator.c
@@ -257,7 +257,7 @@ static void dial_draw_intern(
gpuPopMatrix();
}
-static void manipulator_dial_render_3d_intersect(const bContext *C,
wmManipulator *mpr, int selectionbase)
+static void manipulator_dial_draw_select(const bContext *C, wmManipulator
*mpr, int selectionbase)
{
DialManipulator *dial = (DialManipulator *)mpr;
float clip_plane_buf[4];
@@ -360,7 +360,7 @@ static void MANIPULATOR_WT_dial_3d(wmManipulatorType *wt)
/* api callbacks */
wt->draw = manipulator_dial_draw;
- wt->draw_select = manipulator_dial_render_3d_intersect;
+ wt->draw_select = manipulator_dial_draw_select;
wt->invoke = manipulator_dial_invoke;
wt->struct_size = sizeof(DialManipulator);
diff --git a/source/blender/editors/manipulator_library/facemap3d_manipulator.c
b/source/blender/editors/manipulator_library/facemap3d_manipulator.c
index d9a3de920df..73aa6290350 100644
--- a/source/blender/editors/manipulator_library/facemap3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/facemap3d_manipulator.c
@@ -80,7 +80,7 @@ static void widget_facemap_draw(const bContext *C, struct
wmManipulator *widget)
gpuPopMatrix();
}
-static void widget_facemap_render_3d_intersect(const bContext *C, struct
wmManipulator *widget, int selectionbase)
+static void widget_facemap_draw_select(const bContext *C, struct wmManipulator
*widget, int selectionbase)
{
GPU_select_load_id(selectionbase);
widget_facemap_draw(C, widget);
@@ -132,7 +132,7 @@ static void MANIPULATOR_WT_facemap3d(wmManipulatorType *wt)
/* api callbacks */
wt->draw = widget_facemap_draw;
- wt->draw_select = widget_facemap_render_3d_intersect;
+ wt->draw_select = widget_facemap_draw_select;
wt->struct_size = sizeof(FacemapManipulator);
}
diff --git
a/source/blender/editors/manipulator_library/primitive3d_manipulator.c
b/source/blender/editors/manipulator_library/primitive3d_manipulator.c
index 8c5d591fd32..08fa6766aeb 100644
--- a/source/blender/editors/manipulator_library/primitive3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/primitive3d_manipulator.c
@@ -156,7 +156,7 @@ static void manipulator_primitive_draw_intern(
}
}
-static void manipulator_primitive_render_3d_intersect(
+static void manipulator_primitive_draw_select(
const bContext *UNUSED(C), wmManipulator *mpr,
int selectionbase)
{
@@ -237,7 +237,7 @@ static void MANIPULATOR_WT_primitive3d(wmManipulatorType
*wt)
/* api callbacks */
wt->draw = manipulator_primitive_draw;
- wt->draw_select = manipulator_primitive_render_3d_intersect;
+ wt->draw_select = manipulator_primitive_draw_select;
wt->invoke = manipulator_primitive_invoke;
wt->struct_size = sizeof(PrimitiveManipulator);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
