Commit: 28fa9ec7c01a731104a891e5f487becbdc010c24
Author: Julian Eisel
Date: Tue Oct 4 02:16:28 2016 +0200
Branches: custom-manipulators
https://developer.blender.org/rB28fa9ec7c01a731104a891e5f487becbdc010c24
Make manipulators work with changes from last merge
===================================================================
M source/blender/editors/space_view3d/view3d_widgets.c
M source/blender/editors/transform/transform_manipulator.c
M
source/blender/windowmanager/manipulators/intern/manipulator_library/arrow2d_manipulator.c
M
source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
M
source/blender/windowmanager/manipulators/intern/manipulator_library/dial_manipulator.c
M
source/blender/windowmanager/manipulators/intern/manipulator_library/facemap_manipulator.c
M
source/blender/windowmanager/manipulators/intern/manipulator_library/primitive_manipulator.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_widgets.c
b/source/blender/editors/space_view3d/view3d_widgets.c
index f67dd63..fcf32b5 100644
--- a/source/blender/editors/space_view3d/view3d_widgets.c
+++ b/source/blender/editors/space_view3d/view3d_widgets.c
@@ -114,7 +114,7 @@ void VIEW3D_WGT_lamp(wmManipulatorGroupType *wgt)
wgt->init = WIDGETGROUP_lamp_init;
wgt->refresh = WIDGETGROUP_lamp_refresh;
- wgt->is_3d = true;
+ wgt->flag |= (WM_MANIPULATORGROUPTYPE_IS_3D |
WM_MANIPULATORGROUPTYPE_SCALE_3D);
}
static bool WIDGETGROUP_camera_poll(const bContext *C, wmManipulatorGroupType
*UNUSED(wgrouptype))
@@ -165,7 +165,6 @@ static void WIDGETGROUP_camera_init(const bContext *C,
wmManipulatorGroup *wgrou
camgroup->dop_dist = MANIPULATOR_arrow_new(wgroup,
"dof_distance", MANIPULATOR_ARROW_STYLE_CROSS);
WM_manipulator_set_flag(camgroup->dop_dist,
WM_MANIPULATOR_DRAW_HOVER, true);
- WM_manipulator_set_flag(camgroup->dop_dist,
WM_MANIPULATOR_SCALE_3D, false);
WM_manipulator_set_colors(camgroup->dop_dist, color, color_hi);
}
@@ -178,14 +177,12 @@ static void WIDGETGROUP_camera_init(const bContext *C,
wmManipulatorGroup *wgrou
camgroup->focallen = MANIPULATOR_arrow_new(
wgroup, "focal_len",
(MANIPULATOR_ARROW_STYLE_CONE |
MANIPULATOR_ARROW_STYLE_CONSTRAINED));
- WM_manipulator_set_flag(camgroup->focallen,
WM_MANIPULATOR_SCALE_3D, false);
WM_manipulator_set_colors(camgroup->focallen, color, color_hi);
cameragroup_property_setup(camgroup->focallen, ob, ca, false);
camgroup->ortho_scale = MANIPULATOR_arrow_new(
wgroup, "ortho_scale",
(MANIPULATOR_ARROW_STYLE_CONE |
MANIPULATOR_ARROW_STYLE_CONSTRAINED));
- WM_manipulator_set_flag(camgroup->ortho_scale,
WM_MANIPULATOR_SCALE_3D, false);
WM_manipulator_set_colors(camgroup->ortho_scale, color,
color_hi);
cameragroup_property_setup(camgroup->ortho_scale, ob, ca, true);
}
@@ -269,7 +266,7 @@ void VIEW3D_WGT_camera(wmManipulatorGroupType *wgt)
wgt->init = WIDGETGROUP_camera_init;
wgt->refresh = WIDGETGROUP_camera_refresh;
- wgt->is_3d = true;
+ wgt->flag |= WM_MANIPULATORGROUPTYPE_IS_3D;
}
static bool WIDGETGROUP_forcefield_poll(const bContext *C,
wmManipulatorGroupType *UNUSED(wgrouptype))
@@ -293,7 +290,6 @@ static void WIDGETGROUP_forcefield_init(const bContext
*UNUSED(C), wmManipulator
MANIPULATOR_arrow_set_ui_range(wwrapper->manipulator, -200.0f, 200.0f);
MANIPULATOR_arrow_set_range_fac(wwrapper->manipulator, 6.0f);
WM_manipulator_set_colors(wwrapper->manipulator, col, col_hi);
- WM_manipulator_set_flag(wwrapper->manipulator, WM_MANIPULATOR_SCALE_3D,
false);
}
static void WIDGETGROUP_forcefield_refresh(const bContext *C,
wmManipulatorGroup *wgroup)
@@ -328,7 +324,7 @@ void VIEW3D_WGT_force_field(wmManipulatorGroupType *wgt)
wgt->init = WIDGETGROUP_forcefield_init;
wgt->refresh = WIDGETGROUP_forcefield_refresh;
- wgt->is_3d = true;
+ wgt->flag |= WM_MANIPULATORGROUPTYPE_IS_3D;
}
/* draw facemaps depending on the selected bone in pose mode */
@@ -573,5 +569,7 @@ void VIEW3D_WGT_armature_facemaps(wmManipulatorGroupType
*wgt)
wgt->keymap_init = WM_manipulatorgroup_keymap_common_sel;
- wgt->is_3d = true;
+ wgt->flag |= (WM_MANIPULATORGROUPTYPE_IS_3D |
+ WM_MANIPULATORGROUPTYPE_SCALE_3D |
+ WM_MANIPULATORGROUPTYPE_SELECTABLE);
}
diff --git a/source/blender/editors/transform/transform_manipulator.c
b/source/blender/editors/transform/transform_manipulator.c
index f7ce20f..e4890be 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -1397,7 +1397,7 @@ void TRANSFORM_WGT_manipulator(wmManipulatorGroupType
*wgt)
wgt->refresh = WIDGETGROUP_manipulator_refresh;
wgt->draw_prepare = WIDGETGROUP_manipulator_draw_prepare;
- wgt->is_3d = true;
+ wgt->flag |= (WM_MANIPULATORGROUPTYPE_IS_3D |
WM_MANIPULATORGROUPTYPE_SCALE_3D);
}
@@ -1437,5 +1437,5 @@ void TRANSFORM_WGT_object(wmManipulatorGroupType *wgt)
wgt->refresh = WIDGETGROUP_manipulator_refresh;
wgt->draw_prepare = WIDGETGROUP_manipulator_draw_prepare;
- wgt->is_3d = true;
+ wgt->flag |= (WM_MANIPULATORGROUPTYPE_IS_3D |
WM_MANIPULATORGROUPTYPE_SCALE_3D);
}
diff --git
a/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow2d_manipulator.c
b/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow2d_manipulator.c
index b6ae239..cc38b4a 100644
---
a/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow2d_manipulator.c
+++
b/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow2d_manipulator.c
@@ -99,7 +99,7 @@ static void manipulator_arrow2d_draw(const bContext
*UNUSED(C), wmManipulator *m
ArrowManipulator2D *arrow = (ArrowManipulator2D *)manipulator;
float col[4];
- manipulator_color_get(manipulator, manipulator->flag &
WM_MANIPULATOR_HIGHLIGHT, col);
+ manipulator_color_get(manipulator, manipulator->state &
WM_MANIPULATOR_HIGHLIGHT, col);
glColor4fv(col);
glLineWidth(manipulator->line_width);
diff --git
a/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
b/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
index 78e8cc1..b2441e5 100644
---
a/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
+++
b/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
@@ -258,7 +258,7 @@ static void manipulator_arrow_render_3d_intersect(
static void manipulator_arrow_draw(const bContext *UNUSED(C), wmManipulator
*manipulator)
{
- arrow_draw_intern((ArrowManipulator *)manipulator, false,
(manipulator->flag & WM_MANIPULATOR_HIGHLIGHT) != 0);
+ arrow_draw_intern((ArrowManipulator *)manipulator, false,
(manipulator->state & WM_MANIPULATOR_HIGHLIGHT) != 0);
}
/**
@@ -475,7 +475,7 @@ wmManipulator *MANIPULATOR_arrow_new(wmManipulatorGroup
*mgroup, const char *nam
arrow->manipulator.render_3d_intersection =
manipulator_arrow_render_3d_intersect;
arrow->manipulator.prop_data_update =
manipulator_arrow_prop_data_update;
arrow->manipulator.exit = manipulator_arrow_exit;
- arrow->manipulator.flag |= (WM_MANIPULATOR_SCALE_3D |
WM_MANIPULATOR_DRAW_ACTIVE);
+ arrow->manipulator.flag |= WM_MANIPULATOR_DRAW_ACTIVE;
arrow->style = real_style;
arrow->len = 1.0f;
diff --git
a/source/blender/windowmanager/manipulators/intern/manipulator_library/dial_manipulator.c
b/source/blender/windowmanager/manipulators/intern/manipulator_library/dial_manipulator.c
index 287fd55..df1f687 100644
---
a/source/blender/windowmanager/manipulators/intern/manipulator_library/dial_manipulator.c
+++
b/source/blender/windowmanager/manipulators/intern/manipulator_library/dial_manipulator.c
@@ -208,7 +208,7 @@ static void dial_draw_intern(const bContext *C,
DialManipulator *dial, const boo
glTranslate3fv(dial->manipulator.offset);
/* draw rotation indicator arc first */
- if ((dial->manipulator.flag & WM_MANIPULATOR_DRAW_VALUE) &&
(dial->manipulator.flag & WM_MANIPULATOR_ACTIVE)) {
+ if ((dial->manipulator.flag & WM_MANIPULATOR_DRAW_VALUE) &&
(dial->manipulator.state & WM_MANIPULATOR_ACTIVE)) {
wmWindow *win = CTX_wm_window(C);
const float co_outer[4] = {0.0f, DIAL_WIDTH, 0.0f}; /*
coordinate at which the arc drawing will be started */
float angle_ofs, angle_delta;
@@ -257,7 +257,7 @@ static void manipulator_dial_render_3d_intersect(const
bContext *C, wmManipulato
static void manipulator_dial_draw(const bContext *C, wmManipulator
*manipulator)
{
DialManipulator *dial = (DialManipulator *)manipulator;
- const bool active = manipulator->flag & WM_MANIPULATOR_ACTIVE;
+ const bool active = manipulator->state & WM_MANIPULATOR_ACTIVE;
/* enable clipping if needed */
if (!active && dial->style == MANIPULATOR_DIAL_STYLE_RING_CLIPPED) {
@@ -272,7 +272,7 @@ static void manipulator_dial_draw(const bContext *C,
wmManipulator *manipulator)
}
glEnable(GL_BLEND);
- dial_draw_intern(C, dial, false, (manipulator->flag &
WM_MANIPULATOR_HIGHLIGHT) != 0);
+ dial_draw_intern(C, dial, false, (manipulator->state &
WM_MANIPULATOR_HIGHLIGHT) != 0);
glDisable(GL_BLEND);
if (!active && dial->style == MANIPULATOR_DIAL_STYLE_RING_CLIPPED) {
@@ -318,7 +318,6 @@ wmManipulator *MANIPULATOR_dial_new(wmManipulatorGroup
*mgroup, const char *name
dial->manipulator.intersect = NULL;
dial->manipulator.render_3d_intersection =
manipulator_dial_render_3d_intersect;
dial->manipulator.invoke = manipulator_dial_invoke;
- dial->manipulator.flag |= WM_MANIPULATOR_SCALE_3D;
dial->style = style;
diff --git
a/source/blender/windowmanager/manipulators/intern/manipulator_library/facemap_manipulator.c
b/source/blender/windowmanager/manipulators/intern/manipulator_library/facemap_manipulator.c
index 8219a0c..782c353 100644
---
a/source/blender/windowmanager/manipulators/intern/manipulator_library/facemap_manipulator.c
+++
b/source/blender/windowmanager/manipulators/intern/manipulator_library/facemap_manipulator.c
@@ -70,7 +70,7 @@ typedef struct FacemapManipulator {
static void widget_facemap_draw(const bContext *C, wmManipulator *widget)
{
FacemapManipulator *fmap_widget = (FacemapManipulator *)widget;
- const float *col = (widget->flag & WM_MANIPULATOR_SELECTED) ?
widget->col_hi : widget->col;
+ const float *col = (widget->state & WM_MANIPULATOR_SELECTED) ?
widget->col_hi : widget->col;
glPushMatrix();
glMultMatrixf(fmap_widget->ob->obmat);
diff --git
a/source/blender/windowmanager/manipulators/intern/manipulator_library/primitive_manipulator.c
b/source/blender/windowmanager/manipulators/intern/manipulator_library/primitive_manipulator.c
index 8293be6..be86625 100644
---
a/source/blender/windowmanager/manipulators/intern/manipulator_library/primitive_manipulator.c
+++
b/source/blender/windowmanager/manipulators/intern/manipulator_library/primitive_manipulator.c
@@ -171,7 +171,7 @@ static void manipulator_primitive_draw(const bContext
*UNUSED(C), wmManipulator
{
manipulator_primitive_draw_intern(
(PrimitiveManipulato
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
