Commit: 2976d3e12038c26c159505826bc20fb2fe91ab40
Author: Julian Eisel
Date: Thu Sep 29 00:53:11 2016 +0200
Branches: custom-manipulators
https://developer.blender.org/rB2976d3e12038c26c159505826bc20fb2fe91ab40
Make branch compile after latest merge
===================================================================
M source/blender/blenloader/intern/readfile.c
M source/blender/editors/armature/pose_select.c
M source/blender/editors/object/object_edit.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/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/makesdna/DNA_screen_types.h
M source/blender/makesrna/intern/rna_wm.c
M source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index 42004ff..ae677ca 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6523,7 +6523,6 @@ static void direct_link_region(FileData *fd, ARegion *ar,
int spacetype)
BLI_listbase_clear(&ar->panels_category);
BLI_listbase_clear(&ar->handlers);
BLI_listbase_clear(&ar->uiblocks);
- BLI_listbase_clear(&ar->manipulator_maps);
ar->headerstr = NULL;
ar->swinid = 0;
ar->type = NULL;
diff --git a/source/blender/editors/armature/pose_select.c
b/source/blender/editors/armature/pose_select.c
index a4f7860..eff14cd 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->manipulator_maps.first, action);
+ WM_manipulatormap_select_all(C, ar->manipulator_map, action);
}
WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, NULL);
diff --git a/source/blender/editors/object/object_edit.c
b/source/blender/editors/object/object_edit.c
index d7a6681..c45b9a9 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -2182,9 +2182,9 @@ void OBJECT_OT_game_physics_copy(struct wmOperatorType
*ot)
static int object_widget_add_exec(bContext *C, wmOperator *UNUSED(op))
{
Object *ob = ED_object_active_context((bContext *)C);
- wmManipulatorMapType *wmaptype = WM_manipulatormaptype_find(&(const
struct wmManipulatorMapType_Params) {
- "View3D", SPACE_VIEW3D, RGN_TYPE_WINDOW,
WM_MANIPULATORMAPTYPE_3D});
- wmManipulatorGroupType *wgrouptype =
WM_manipulatorgrouptype_append(wmaptype, TRANSFORM_WGT_object);
+ wmManipulatorMapType *mmaptype = WM_manipulatormaptype_find(&(const
struct wmManipulatorMapType_Params) {
+ "View3D", SPACE_VIEW3D, RGN_TYPE_WINDOW});
+ wmManipulatorGroupType *wgrouptype =
WM_manipulatorgrouptype_append(mmaptype, TRANSFORM_WGT_object);
/* assign the objects id name to the widget */
strcpy(wgrouptype->idname, ob->id.name);
diff --git a/source/blender/editors/space_graph/graph_edit.c
b/source/blender/editors/space_graph/graph_edit.c
index 89918b9..971f8a3 100644
--- a/source/blender/editors/space_graph/graph_edit.c
+++ b/source/blender/editors/space_graph/graph_edit.c
@@ -2842,7 +2842,6 @@ 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->manipulator_maps.first;
BackDropTransformData *data = op->customdata;
if (event->type == data->event_type && event->val == KM_PRESS) {
@@ -2884,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 - XXX
*/
- if (/*!wmap->mmap_context.active_manipulator &&
*/event->val == KM_PRESS) {
+ if
(/*!ar->manipulator_map->mmap_context.active_manipulator && */event->val ==
KM_PRESS) {
copy_v2_v2(sipo->backdrop_offset,
data->init_offset);
sipo->backdrop_zoom = data->init_zoom;
@@ -2893,7 +2892,7 @@ static int graph_widget_backdrop_transform_modal(bContext
*C, wmOperator *op, co
}
}
}
- WM_manipulatormap_tag_refresh(wmap);
+ WM_manipulatormap_tag_refresh(ar->manipulator_map);
return OPERATOR_RUNNING_MODAL;
}
diff --git a/source/blender/editors/space_graph/space_graph.c
b/source/blender/editors/space_graph/space_graph.c
index 4bbcd54..3996420 100644
--- a/source/blender/editors/space_graph/space_graph.c
+++ b/source/blender/editors/space_graph/space_graph.c
@@ -225,12 +225,9 @@ static void graph_main_region_init(wmWindowManager *wm,
ARegion *ar)
keymap = WM_keymap_find(wm->defaultconf, "Graph Editor Generic",
SPACE_IPO, 0);
WM_event_add_keymap_handler(&ar->handlers, keymap);
- /* widgets */
- if (BLI_listbase_is_empty(&ar->manipulator_maps)) {
- wmManipulatorMap *wmap =
WM_manipulatormap_new_from_type(&(const struct wmManipulatorMapType_Params) {
- "Graph_Canvas", SPACE_IPO, RGN_TYPE_WINDOW, 0});
- BLI_addhead(&ar->manipulator_maps, wmap);
- }
+ /* manipulators */
+ ar->manipulator_map = WM_manipulatormap_new_from_type(&(const struct
wmManipulatorMapType_Params) {
+ "Graph_Canvas", SPACE_IPO, RGN_TYPE_WINDOW});
}
static void graph_main_region_draw(const bContext *C, ARegion *ar)
@@ -352,8 +349,8 @@ static void graph_main_region_draw(const bContext *C,
ARegion *ar)
UI_view2d_view_restore(C);
/* finally draw any widgets here */
- WM_manipulatormap_update(C, ar->manipulator_maps.first);
- WM_manipulatormap_draw(C, ar->manipulator_maps.first, false, true);
+ WM_manipulatormap_update(C, ar->manipulator_map);
+ WM_manipulatormap_draw(C, ar->manipulator_map, 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 b928a24..05ef596 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -673,13 +673,10 @@ static void image_main_region_init(wmWindowManager *wm,
ARegion *ar)
// image space manages own v2d
// UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_STANDARD, ar->winx,
ar->winy);
- /* widgets */
- if (BLI_listbase_is_empty(&ar->manipulator_maps)) {
- wmManipulatorMap *wmap =
WM_manipulatormap_new_from_type(&(const struct wmManipulatorMapType_Params) {
- "Image_UV", SPACE_IMAGE, RGN_TYPE_WINDOW, 0});
- BLI_addhead(&ar->manipulator_maps, wmap);
- }
- WM_manipulatormaps_add_handlers(ar);
+ /* manipulators */
+ ar->manipulator_map = WM_manipulatormap_new_from_type(&(const struct
wmManipulatorMapType_Params) {
+ "Image_UV", SPACE_IMAGE, RGN_TYPE_WINDOW, 0});
+ WM_manipulatormaps_add_handlers(ar, ar->manipulator_map);
/* mask polls mode */
keymap = WM_keymap_find(wm->defaultconf, "Mask Editing", 0, 0);
@@ -821,8 +818,8 @@ static void image_main_region_draw(const bContext *C,
ARegion *ar)
UI_view2d_view_restore(C);
}
- WM_manipulatormap_update(C, ar->manipulator_maps.first);
- WM_manipulatormap_draw(C, ar->manipulator_maps.first, false, true);
+ WM_manipulatormap_update(C, ar->manipulator_map);
+ WM_manipulatormap_draw(C, ar->manipulator_map, false, true);
draw_image_cache(C, ar);
@@ -836,14 +833,11 @@ static void image_main_region_draw(const bContext *C,
ARegion *ar)
static void image_main_region_listener(bScreen *UNUSED(sc), ScrArea *sa,
ARegion *ar, wmNotifier *wmn)
{
- wmManipulatorMap *wmap = WM_manipulatormap_find(ar, &(const struct
wmManipulatorMapType_Params) {
- "Image_UV", SPACE_IMAGE, RGN_TYPE_WINDOW, 0});
-
/* context changes */
switch (wmn->category) {
case NC_GEOM:
if (ELEM(wmn->data, ND_DATA, ND_SELECT))
- WM_manipulatormap_tag_refresh(wmap);
+
WM_manipulatormap_tag_refresh(ar->manipulator_map);
break;
case NC_GPENCIL:
if (ELEM(wmn->action, NA_EDITED, NA_SELECTED))
@@ -854,7 +848,7 @@ static void image_main_region_listener(bScreen *UNUSED(sc),
ScrArea *sa, ARegion
case NC_IMAGE:
if (wmn->action == NA_PAINTING)
ED_region_tag_redraw(ar);
- WM_manipulatormap_tag_refresh(wmap);
+ WM_manipulatormap_tag_refresh(ar->manipulator_map);
break;
case NC_MATERIAL:
if (wmn->data == ND_SHADING_LINKS) {
diff --git a/source/blender/editors/space_node/node_draw.c
b/source/blender/editors/space_node/node_draw.c
index 2faed99..eb16374 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_update(C, ar->manipulator_maps.first);
- WM_manipulatormap_draw(C, ar->manipulator_maps.first,
false, true);
+ WM_manipulatormap_update(C, ar->manipulator_map);
+ WM_manipulatormap_draw(C, ar->manipulator_map, false,
true);
glMatrixMode(GL_PROJECTION);
glPopMatrix();
diff --git a/source/blender/editors/space_node/space_node.c
b/source/blender/editors/space_node/space_node.c
index baeb4b8..c73465c 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -648,14 +648,11 @@ 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->manipulator_maps)) {
- wmManipulatorMap *wmap =
WM_manipulatormap_new_from_type(&(const struct wmManipulatorMapType_Params) {
- "Node_Canvas", SPACE_NODE, RGN_TYPE_WINDOW, 0});
- BLI_addhead(&ar->manipulator_maps, wmap);
- }
+ /* manipulators stay in the background for now - quick patchjob to make
sure nodes themselves work */
+ ar->manipulator_map = WM_manipulatormap_new_from_type(&(const struct
wmManipulatorMapType_Params) {
+ "Node_Canvas", SPACE_NODE, RGN_TYPE_WINDOW});
- WM_manipulatormaps_add_handlers(ar);
+ WM_manipulatormaps_add_handlers(ar, ar->manipulator_map);
/* own keymaps */
keymap = WM_keymap_find(wm->defaultconf, "Node Generic", SPACE_NODE, 0);
@@ -753,8 +750,7 @@ static void node_header_region_draw(const bContext *C,
ARegion *ar)
/* used for header + main region */
static void node_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa),
ARegion *ar, wmNotifier *wmn)
{
- wmManipulatorMap *wmap = WM_manipulatormap_find(ar, &(const struct
wmManipulatorMapType_Params) {
- "Node_Canvas", SPACE_NODE, RGN_TYPE_WINDOW, 0});
+ wmManipulatorMap *mmap = ar->manipulator_map;
/* context changes */
switch (wmn->category) {
@@ -764,13 +760,13 @@ static void node_region_listener(bScreen *UNUSED(
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
