Commit: 15575c8a79b2fcce64e58617a3f080ceb3408d14 Author: Julian Eisel Date: Thu Sep 22 02:08:31 2016 +0200 Branches: wiggly-widgets https://developer.blender.org/rB15575c8a79b2fcce64e58617a3f080ceb3408d14
Make branch compile again after latest changes in temp_manipulators_core =================================================================== M source/blender/editors/include/ED_transform.h 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_widgets.c M source/blender/editors/space_node/space_node.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_widgets.c M source/blender/editors/transform/transform_manipulator.c M source/blender/editors/transform/transform_manipulator2d.c M source/blender/makesrna/intern/rna_wm.c M source/blender/windowmanager/manipulators/WM_manipulator_api.h M source/blender/windowmanager/manipulators/intern/manipulator_library/facemap_manipulator.c M source/blender/windowmanager/manipulators/intern/wm_manipulator.c M source/blenderplayer/bad_level_call_stubs/stubs.c =================================================================== diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h index 463971b..f432aec 100644 --- a/source/blender/editors/include/ED_transform.h +++ b/source/blender/editors/include/ED_transform.h @@ -166,7 +166,7 @@ void TRANSFORM_WGT_manipulator(struct wmManipulatorGroupType *wgt); void TRANSFORM_WGT_object(struct wmManipulatorGroupType *wgt); -int WIDGETGROUP_manipulator2d_poll(const struct bContext *C, struct wmManipulatorGroupType *wgrouptype); +bool WIDGETGROUP_manipulator2d_poll(const struct bContext *C, struct wmManipulatorGroupType *wgrouptype); void WIDGETGROUP_manipulator2d_init(const struct bContext *C, struct wmManipulatorGroup *wgroup); void WIDGETGROUP_manipulator2d_refresh(const struct bContext *C, struct wmManipulatorGroup *wgroup); void WIDGETGROUP_manipulator2d_draw_prepare(const struct bContext *C, struct wmManipulatorGroup *wgroup); diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index f74d31a..89918b9 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -46,6 +46,7 @@ #include "BLI_utildefines.h" #include "DNA_anim_types.h" +#include "DNA_manipulator_types.h" #include "DNA_scene_types.h" #include "RNA_access.h" @@ -2882,8 +2883,8 @@ 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->mmap_context.active_manipulator && event->val == KM_PRESS) { + /* only end modal if we're not dragging a widget - XXX */ + 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; diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c index b101d61..4bbcd54 100644 --- a/source/blender/editors/space_graph/space_graph.c +++ b/source/blender/editors/space_graph/space_graph.c @@ -227,7 +227,7 @@ static void graph_main_region_init(wmWindowManager *wm, ARegion *ar) /* widgets */ if (BLI_listbase_is_empty(&ar->manipulator_maps)) { - wmManipulatorMap *wmap = WM_manipulatormap_from_type(&(const struct wmManipulatorMapType_Params) { + 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); } @@ -750,7 +750,7 @@ void ED_spacetype_ipo(void) st->keymap = graphedit_keymap; st->listener = graph_listener; st->refresh = graph_refresh; - st->widgets = graph_widgets; + st->manipulators = graph_widgets; st->id_remap = graph_id_remap; /* regions: main window */ diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index dd4f259..b928a24 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -675,7 +675,7 @@ static void image_main_region_init(wmWindowManager *wm, ARegion *ar) /* widgets */ if (BLI_listbase_is_empty(&ar->manipulator_maps)) { - wmManipulatorMap *wmap = WM_manipulatormap_from_type(&(const struct wmManipulatorMapType_Params) { + 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); } @@ -1074,7 +1074,7 @@ void ED_spacetype_image(void) st->refresh = image_refresh; st->listener = image_listener; st->context = image_context; - st->widgets = image_widgets; + st->manipulators = image_widgets; st->id_remap = image_id_remap; /* regions: main window */ diff --git a/source/blender/editors/space_node/node_widgets.c b/source/blender/editors/space_node/node_widgets.c index 8129c20..4201c1a 100644 --- a/source/blender/editors/space_node/node_widgets.c +++ b/source/blender/editors/space_node/node_widgets.c @@ -26,6 +26,7 @@ #include "BKE_image.h" #include "DNA_image_types.h" +#include "DNA_manipulator_types.h" #include "ED_screen.h" @@ -41,7 +42,7 @@ #include "node_intern.h" -static int WIDGETGROUP_node_transform_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgrouptype)) +static bool WIDGETGROUP_node_transform_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgrouptype)) { SpaceNode *snode = CTX_wm_space_node(C); diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index 2260f75..baeb4b8 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -650,7 +650,7 @@ static void node_main_region_init(wmWindowManager *wm, ARegion *ar) /* 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_from_type(&(const struct wmManipulatorMapType_Params) { + 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); } @@ -920,7 +920,7 @@ void ED_spacetype_node(void) st->refresh = node_area_refresh; st->context = node_context; st->dropboxes = node_dropboxes; - st->widgets = node_widgets; + st->manipulators = node_widgets; st->id_remap = node_id_remap; /* regions: main window */ diff --git a/source/blender/editors/space_sequencer/sequencer_view.c b/source/blender/editors/space_sequencer/sequencer_view.c index e2bed30..f1c1a82 100644 --- a/source/blender/editors/space_sequencer/sequencer_view.c +++ b/source/blender/editors/space_sequencer/sequencer_view.c @@ -380,8 +380,8 @@ static int sequencer_overdrop_transform_modal(bContext *C, wmOperator *op, const { SpaceSeq *sseq = CTX_wm_space_seq(C); - /* only end modal if we're not dragging a manipulator */ - if (!wmap->mmap_context.active_manipulator && event->val == KM_PRESS) { + /* only end modal if we're not dragging a manipulator - XXX */ + if (/*!wmap->mmap_context.active_manipulator && */event->val == KM_PRESS) { copy_v2_v2(sseq->overdrop_offset, data->init_offset); sseq->overdrop_zoom = data->init_zoom; @@ -543,7 +543,7 @@ static int sequencer_image_transform_widget_modal(bContext *C, wmOperator *op, c /* no offset needed in this case */ offset[0] = offset[1] = 0; - WM_manipulator_set_offset(wmap->mmap_context.active_manipulator, offset); +// WM_manipulator_set_offset(wmap->mmap_context.active_manipulator, offset); break; } diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index 803c4bd..3d0201c 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -488,7 +488,7 @@ static void sequencer_main_region_init(wmWindowManager *wm, ARegion *ar) /* no modal keymap here, only operators use this currently */ if (BLI_listbase_is_empty(&ar->manipulator_maps)) { - wmManipulatorMap *wmap = WM_manipulatormap_from_type(&(const struct wmManipulatorMapType_Params) { + wmManipulatorMap *wmap = WM_manipulatormap_new_from_type(&(const struct wmManipulatorMapType_Params) { "Seq_Canvas", SPACE_SEQ, RGN_TYPE_WINDOW, 0}); BLI_addhead(&ar->manipulator_maps, wmap); } @@ -570,7 +570,7 @@ static void sequencer_preview_region_init(wmWindowManager *wm, ARegion *ar) WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct); if (BLI_listbase_is_empty(&ar->manipulator_maps)) { - wmManipulatorMap *wmap = WM_manipulatormap_from_type(&(const struct wmManipulatorMapType_Params) { + wmManipulatorMap *wmap = WM_manipulatormap_new_from_type(&(const struct wmManipulatorMapType_Params) { "Seq_Canvas", SPACE_SEQ, RGN_TYPE_PREVIEW, 0}); BLI_addhead(&ar->manipulator_maps, wmap); } @@ -754,7 +754,7 @@ void ED_spacetype_sequencer(void) st->dropboxes = sequencer_dropboxes; st->refresh = sequencer_refresh; st->listener = sequencer_listener; - st->widgets = sequencer_widgets; + st->manipulators = sequencer_widgets; st->id_remap = sequencer_id_remap; /* regions: main window */ diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 79d2cb4..8110850 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -501,7 +501,7 @@ static void view3d_main_region_init(wmWindowManager *wm, ARegion *ar) wmKeyMap *keymap; if (BLI_listbase_is_empty(&ar->manipulator_maps)) { - wmManipulatorMap *wmap = WM_manipulatormap_from_type(&(const struct wmManipulatorMapType_Params) { + wmManipulatorMap *wmap = WM_manipulatormap_new_from_type(&(const struct wmManipulatorMapType_Params) { "View3D", SPACE_VIEW3D, RGN_TYPE_WINDOW, WM_MANIPULATORMAPTYPE_3D}); BLI_addhead(&ar->manipulator_maps, wmap); } @@ -1523,7 +1523,7 @@ void ED_spacetype_view3d(void) st->operatortypes = view3d_operatortypes; st->keymap = view3d_keymap; st->dropboxes = view3d_dropboxes; - st->widgets = view3d_widgets; + st->manipulators = view3d_widgets; st->context = view3d_context; st->id_remap = view3d_id_remap; diff --git a/source/blender/editors/space_view3d/view3d_widgets.c b/source/blender/editors/space_view3d/view3d_widgets.c index a699aff..6166e4f 100644 --- a/source/blender/editors/space_view3d/view3d_widgets.c +++ b/source/blender/editors/space_view3d/view3d_widgets.c @@ -36,9 +36,10 @@ #include "DNA_armature_types.h" #include "DNA_camera_types.h" +#include "DNA_lamp_types.h" #include "DNA_object_types.h" #include "DNA_object_force.h" -#include "DNA_lamp_types.h" +#include "DNA_manipulator_types.h" #include "ED_armature.h" #include "ED_screen.h" @@ -59,7 +60,7 @@ typedef struct CameraWidgetGroup { } CameraWidgetGroup; -static int WIDGETGR @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs