Commit: 967dddd849ea7101532bff5cfdb6e3a971a2fb4d
Author: Julian Eisel
Date: Sun Sep 11 23:48:36 2016 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB967dddd849ea7101532bff5cfdb6e3a971a2fb4d
Make branch work with changes from temp_manipulators_core
===================================================================
M source/blender/CMakeLists.txt
M source/blender/blenkernel/CMakeLists.txt
M source/blender/editors/armature/pose_select.c
M source/blender/editors/space_graph/graph_edit.c
M source/blender/editors/space_graph/space_graph.c
M source/blender/editors/space_image/space_image.c
M source/blender/editors/space_node/node_draw.c
M source/blender/editors/space_node/node_widgets.c
M source/blender/editors/space_node/space_node.c
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/editors/space_sequencer/sequencer_view.c
M source/blender/editors/space_sequencer/space_sequencer.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_widgets.c
M source/blender/editors/transform/transform_manipulator2d.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/makesrna/intern/rna_wm.c
M source/blender/windowmanager/manipulators/intern/wm_manipulator.c
===================================================================
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index 636b4b7..300baca 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -89,7 +89,6 @@ set(SRC_DNA_INC
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_view2d_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_view3d_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_windowmanager_types.h
- ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_widget_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_world_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_movieclip_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_tracking_types.h
diff --git a/source/blender/blenkernel/CMakeLists.txt
b/source/blender/blenkernel/CMakeLists.txt
index ff6c7a7..bac11f0 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -40,7 +40,6 @@ set(INC
../nodes
../physics
../render/extern/include
- ../windowmanager # XXX
../../../intern/ghost
../../../intern/guardedalloc
../../../intern/glew-mx
diff --git a/source/blender/editors/armature/pose_select.c
b/source/blender/editors/armature/pose_select.c
index 0a2a498..a4f7860 100644
--- a/source/blender/editors/armature/pose_select.c
+++ b/source/blender/editors/armature/pose_select.c
@@ -374,7 +374,7 @@ static int pose_de_select_all_exec(bContext *C, wmOperator
*op)
/* handle facemap widget selection */
if ((ob->mode & OB_MODE_POSE) && has_facemap) {
- WM_manipulatormap_select_all(C, (wmManipulatorMap
*)ar->widgetmaps.first, action);
+ WM_manipulatormap_select_all(C, (wmManipulatorMap
*)ar->manipulator_maps.first, action);
}
WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, NULL);
diff --git a/source/blender/editors/space_graph/graph_edit.c
b/source/blender/editors/space_graph/graph_edit.c
index 270892a..f74d31a 100644
--- a/source/blender/editors/space_graph/graph_edit.c
+++ b/source/blender/editors/space_graph/graph_edit.c
@@ -2770,14 +2770,14 @@ static void widgetgroup_backdrop_init(const bContext
*UNUSED(C), wmManipulatorGr
wmManipulatorWrapper *wwrapper =
MEM_mallocN(sizeof(wmManipulatorWrapper), __func__);
wgroup->customdata = wwrapper;
- wwrapper->widget = MANIPULATOR_rect_transform_new(
+ wwrapper->manipulator = MANIPULATOR_rect_transform_new(
wgroup, "backdrop_cage",
MANIPULATOR_RECT_TRANSFORM_STYLE_SCALE_UNIFORM |
MANIPULATOR_RECT_TRANSFORM_STYLE_TRANSLATE);
}
static void widgetgroup_backdrop_refresh(const struct bContext *C,
wmManipulatorGroup *wgroup)
{
- wmManipulator *cage = ((wmManipulatorWrapper
*)wgroup->customdata)->widget;
+ wmManipulator *cage = ((wmManipulatorWrapper
*)wgroup->customdata)->manipulator;
ARegion *ar = CTX_wm_region(C);
const Scene *scene = CTX_data_scene(C);
const int width = (scene->r.size * scene->r.xsch) / 150.0f;
@@ -2841,7 +2841,7 @@ static void graph_widget_backdrop_transform_cancel(struct
bContext *C, struct wm
static int graph_widget_backdrop_transform_modal(bContext *C, wmOperator *op,
const wmEvent *event)
{
ARegion *ar = CTX_wm_region(C);
- wmManipulatorMap *wmap = ar->widgetmaps.first;
+ wmManipulatorMap *wmap = ar->manipulator_maps.first;
BackDropTransformData *data = op->customdata;
if (event->type == data->event_type && event->val == KM_PRESS) {
@@ -2883,7 +2883,7 @@ static int graph_widget_backdrop_transform_modal(bContext
*C, wmOperator *op, co
SpaceIpo *sipo = CTX_wm_space_graph(C);
/* only end modal if we're not dragging a widget */
- if (!wmap->wmap_context.active_widget && event->val ==
KM_PRESS) {
+ if (!wmap->mmap_context.active_manipulator &&
event->val == KM_PRESS) {
copy_v2_v2(sipo->backdrop_offset,
data->init_offset);
sipo->backdrop_zoom = data->init_zoom;
@@ -2917,7 +2917,7 @@ void GRAPH_OT_widget_backdrop_transform(struct
wmOperatorType *ot)
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
- ot->wgrouptype = WM_manipulatorgrouptype_append(wmaptype,
GRAPH_WGT_backdrop_transform);
+ ot->mgrouptype = WM_manipulatorgrouptype_append(wmaptype,
GRAPH_WGT_backdrop_transform);
RNA_def_float_array(ot->srna, "offset", 2, default_offset, FLT_MIN,
FLT_MAX, "Offset", "Offset of the backdrop", FLT_MIN, FLT_MAX);
RNA_def_float(ot->srna, "scale", 1.0f, 0.0f, FLT_MAX, "Scale", "Scale
of the backdrop", 0.0f, FLT_MAX);
diff --git a/source/blender/editors/space_graph/space_graph.c
b/source/blender/editors/space_graph/space_graph.c
index 0d6ee33..8e922b8 100644
--- a/source/blender/editors/space_graph/space_graph.c
+++ b/source/blender/editors/space_graph/space_graph.c
@@ -226,10 +226,10 @@ static void graph_main_region_init(wmWindowManager *wm,
ARegion *ar)
WM_event_add_keymap_handler(&ar->handlers, keymap);
/* widgets */
- if (BLI_listbase_is_empty(&ar->widgetmaps)) {
+ if (BLI_listbase_is_empty(&ar->manipulator_maps)) {
wmManipulatorMap *wmap = WM_manipulatormap_from_type(&(const
struct wmManipulatorMapType_Params) {
"Graph_Canvas", SPACE_IPO, RGN_TYPE_WINDOW, 0});
- BLI_addhead(&ar->widgetmaps, wmap);
+ BLI_addhead(&ar->manipulator_maps, wmap);
}
}
@@ -352,8 +352,8 @@ static void graph_main_region_draw(const bContext *C,
ARegion *ar)
UI_view2d_view_restore(C);
/* finally draw any widgets here */
- WM_manipulatormap_widgets_update(C, ar->widgetmaps.first);
- WM_manipulatormap_widgets_draw(C, ar->widgetmaps.first, false, true);
+ WM_manipulatormap_update(C, ar->manipulator_maps.first);
+ WM_manipulatormap_draw(C, ar->manipulator_maps.first, false, true);
/* scrollers */
// FIXME: args for scrollers depend on the type of data being shown...
diff --git a/source/blender/editors/space_image/space_image.c
b/source/blender/editors/space_image/space_image.c
index e5b6435..dd4f259 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -674,10 +674,10 @@ static void image_main_region_init(wmWindowManager *wm,
ARegion *ar)
// UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_STANDARD, ar->winx,
ar->winy);
/* widgets */
- if (BLI_listbase_is_empty(&ar->widgetmaps)) {
+ if (BLI_listbase_is_empty(&ar->manipulator_maps)) {
wmManipulatorMap *wmap = WM_manipulatormap_from_type(&(const
struct wmManipulatorMapType_Params) {
"Image_UV", SPACE_IMAGE, RGN_TYPE_WINDOW, 0});
- BLI_addhead(&ar->widgetmaps, wmap);
+ BLI_addhead(&ar->manipulator_maps, wmap);
}
WM_manipulatormaps_add_handlers(ar);
@@ -821,8 +821,8 @@ static void image_main_region_draw(const bContext *C,
ARegion *ar)
UI_view2d_view_restore(C);
}
- WM_manipulatormap_widgets_update(C, ar->widgetmaps.first);
- WM_manipulatormap_widgets_draw(C, ar->widgetmaps.first, false, true);
+ WM_manipulatormap_update(C, ar->manipulator_maps.first);
+ WM_manipulatormap_draw(C, ar->manipulator_maps.first, false, true);
draw_image_cache(C, ar);
diff --git a/source/blender/editors/space_node/node_draw.c
b/source/blender/editors/space_node/node_draw.c
index ede8d87..2faed99 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -1378,8 +1378,8 @@ void drawnodespace(const bContext *C, ARegion *ar)
glaDefine2DArea(&ar->winrct);
wmOrtho2_pixelspace(ar->winx, ar->winy);
- WM_manipulatormap_widgets_update(C,
ar->widgetmaps.first);
- WM_manipulatormap_widgets_draw(C, ar->widgetmaps.first,
false, true);
+ WM_manipulatormap_update(C, ar->manipulator_maps.first);
+ WM_manipulatormap_draw(C, ar->manipulator_maps.first,
false, true);
glMatrixMode(GL_PROJECTION);
glPopMatrix();
diff --git a/source/blender/editors/space_node/node_widgets.c
b/source/blender/editors/space_node/node_widgets.c
index bdac36e..8129c20 100644
--- a/source/blender/editors/space_node/node_widgets.c
+++ b/source/blender/editors/space_node/node_widgets.c
@@ -59,7 +59,7 @@ static void WIDGETGROUP_node_transform_init(const bContext
*UNUSED(C), wmManipul
{
wmManipulatorWrapper *wwrapper =
MEM_mallocN(sizeof(wmManipulatorWrapper), __func__);
- wwrapper->widget = MANIPULATOR_rect_transform_new(
+ wwrapper->manipulator = MANIPULATOR_rect_transform_new(
wgroup, "backdrop_cage",
MANIPULATOR_RECT_TRANSFORM_STYLE_TRANSLATE |
MANIPULATOR_RECT_TRANSFORM_STYLE_SCALE_UNIFORM);
wgroup->customdata = wwrapper;
@@ -68,7 +68,7 @@ static void WIDGETGROUP_node_transform_init(const bContext
*UNUSED(C), wmManipul
static void WIDGETGROUP_node_transform_refresh(const bContext *C,
wmManipulatorGroup *wgroup)
{
- wmManipulator *cage = ((wmManipulatorWrapper
*)wgroup->customdata)->widget;
+ wmManipulator *cage = ((wmManipulatorWrapper
*)wgroup->customdata)->manipulator;
const ARegion *ar = CTX_wm_region(C);
/* center is always at the origin */
const float origin[3] = {ar->winx / 2, ar->winy / 2};
diff --git a/source/blender/editors/space_node/space_node.c
b/source/blender/editors/space_node/space_node.c
index d25ea57..2260f75 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -649,10 +649,10 @@ static void node_main_region_init(wmWindowManager *wm,
ARegion *ar)
UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_CUSTOM, ar->winx,
ar->winy);
/* widgets stay in the background for now - quick patchjob to make sure
nodes themselves work */
- if (BLI_listbase_is_empty(&ar->widgetmaps)) {
+ if (BLI_listbase_is_empty(&ar->manipulator_maps)) {
wmManipulatorMap *wmap = WM_manipulatormap_from_type(&(const
struct wmManipulatorMapType_Params) {
"Node_Canvas", SPACE_NODE, RGN_TYPE_WINDOW, 0});
- BLI_addhead(&ar->widgetmaps, wmap);
+ BLI_addhead(&ar->manipulator_maps, wmap);
}
WM_manipulatormaps_add_handlers(ar);
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c
b/source/blender/editors/space_sequencer/sequencer_draw.c
index 5132be8..9a8fb98 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1680,8 +1680,8 @@ void draw_timeline_seq(const bContext *C, ARegion *ar)
UI_view2d_view_restore(C);
/* finally draw any widgets here */
- WM_manipulatormap_widgets_update(C, ar->widge
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
