From 5ebebcfbfff4c218ab4101ee7f6a66617ee9b01f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 14 Jul 2018 23:49:00 +0200 Subject: WM: rename manipulator to gizmo internally --- source/blender/blenkernel/BKE_context.h | 4 ++-- source/blender/blenkernel/BKE_screen.h | 14 ++++++------- source/blender/blenkernel/intern/blender.c | 2 +- source/blender/blenkernel/intern/blendfile.c | 2 +- source/blender/blenkernel/intern/constraint.c | 4 ++-- source/blender/blenkernel/intern/context.c | 10 ++++----- source/blender/blenkernel/intern/scene.c | 2 +- source/blender/blenkernel/intern/screen.c | 30 +++++++++++++-------------- 8 files changed, 34 insertions(+), 34 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h index 9fa00e7f63f..6703d828bf0 100644 --- a/source/blender/blenkernel/BKE_context.h +++ b/source/blender/blenkernel/BKE_context.h @@ -157,7 +157,7 @@ struct SpaceLink *CTX_wm_space_data(const bContext *C); struct ARegion *CTX_wm_region(const bContext *C); void *CTX_wm_region_data(const bContext *C); struct ARegion *CTX_wm_menu(const bContext *C); -struct wmManipulatorGroup *CTX_wm_manipulator_group(const bContext *C); +struct wmGizmoGroup *CTX_wm_gizmo_group(const bContext *C); struct wmMsgBus *CTX_wm_message_bus(const bContext *C); struct ReportList *CTX_wm_reports(const bContext *C); @@ -185,7 +185,7 @@ void CTX_wm_screen_set(bContext *C, struct bScreen *screen); /* to be removed */ void CTX_wm_area_set(bContext *C, struct ScrArea *sa); void CTX_wm_region_set(bContext *C, struct ARegion *region); void CTX_wm_menu_set(bContext *C, struct ARegion *menu); -void CTX_wm_manipulator_group_set(bContext *C, struct wmManipulatorGroup *mgroup); +void CTX_wm_gizmo_group_set(bContext *C, struct wmGizmoGroup *mgroup); const char *CTX_wm_operator_poll_msg_get(struct bContext *C); void CTX_wm_operator_poll_msg_set(struct bContext *C, const char *msg); diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h index 23f57586ed1..60981c6e76e 100644 --- a/source/blender/blenkernel/BKE_screen.h +++ b/source/blender/blenkernel/BKE_screen.h @@ -51,7 +51,7 @@ struct bScreen; struct uiLayout; struct uiList; struct wmKeyConfig; -struct wmManipulatorMap; +struct wmGizmoMap; struct wmNotifier; struct wmWindow; struct wmWindowManager; @@ -104,8 +104,8 @@ typedef struct SpaceType { /* on startup, define dropboxes for spacetype+regions */ void (*dropboxes)(void); - /* initialize manipulator-map-types and manipulator-group-types with the region */ - void (*manipulators)(void); + /* initialize gizmo-map-types and gizmo-group-types with the region */ + void (*gizmos)(void); /* return context data */ int (*context)(const struct bContext *C, const char *member, struct bContextDataResult *result); @@ -325,9 +325,9 @@ void BKE_spacedata_id_unref(struct ScrArea *sa, struct SpaceLink *sl, struct ID struct ARegion *BKE_area_region_copy(struct SpaceType *st, struct ARegion *ar); void BKE_area_region_free(struct SpaceType *st, struct ARegion *ar); void BKE_screen_area_free(struct ScrArea *sa); -/* Manipulator-maps of a region need to be freed with the region. Uses callback to avoid low-level call. */ -void BKE_region_callback_free_manipulatormap_set(void (*callback)(struct wmManipulatorMap *)); -void BKE_region_callback_refresh_tag_manipulatormap_set(void (*callback)(struct wmManipulatorMap *)); +/* Gizmo-maps of a region need to be freed with the region. Uses callback to avoid low-level call. */ +void BKE_region_callback_free_gizmomap_set(void (*callback)(struct wmGizmoMap *)); +void BKE_region_callback_refresh_tag_gizmomap_set(void (*callback)(struct wmGizmoMap *)); struct ARegion *BKE_area_find_region_type(struct ScrArea *sa, int type); struct ARegion *BKE_area_find_region_active_win(struct ScrArea *sa); @@ -344,7 +344,7 @@ unsigned int BKE_screen_view3d_layer_active( unsigned int BKE_screen_view3d_layer_all(const struct bScreen *sc) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); -void BKE_screen_manipulator_tag_refresh(struct bScreen *sc); +void BKE_screen_gizmo_tag_refresh(struct bScreen *sc); void BKE_screen_view3d_sync(struct View3D *v3d, struct Scene *scene); void BKE_screen_view3d_scene_sync(struct bScreen *sc, struct Scene *scene); diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 23c2147ff7e..66020679bf7 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -300,7 +300,7 @@ void BKE_blender_userdef_app_template_data_swap(UserDef *userdef_a, UserDef *use DATA_SWAP(font_path_ui_mono); DATA_SWAP(keyconfigstr); - DATA_SWAP(manipulator_flag); + DATA_SWAP(gizmo_flag); DATA_SWAP(app_flag); /* We could add others. */ diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c index 27b5089b092..b16648fd73f 100644 --- a/source/blender/blenkernel/intern/blendfile.c +++ b/source/blender/blenkernel/intern/blendfile.c @@ -226,7 +226,7 @@ static void setup_app_data( * only the current screen is important because we wont have to handle * events from multiple screens at once.*/ { - BKE_screen_manipulator_tag_refresh(curscreen); + BKE_screen_gizmo_tag_refresh(curscreen); } } diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 0cbd77b67d2..4f772673e1d 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -463,8 +463,8 @@ static void contarget_get_mesh_mat(Object *ob, const char *substring, float mat[ } /* derive the rotation from the average normal: - * - code taken from transform_manipulator.c, - * calc_manipulator_stats, V3D_MANIP_NORMAL case + * - code taken from transform_gizmo.c, + * calc_gizmo_stats, V3D_MANIP_NORMAL case */ /* we need the transpose of the inverse for a normal... */ copy_m3_m4(imat, ob->obmat); diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index 1aaf5e4f485..68a1e607517 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -80,7 +80,7 @@ struct bContext { struct ScrArea *area; struct ARegion *region; struct ARegion *menu; - struct wmManipulatorGroup *manipulator_group; + struct wmGizmoGroup *gizmo_group; struct bContextStore *store; const char *operator_poll_msg; /* reason for poll failing */ } wm; @@ -675,9 +675,9 @@ struct ARegion *CTX_wm_menu(const bContext *C) return C->wm.menu; } -struct wmManipulatorGroup *CTX_wm_manipulator_group(const bContext *C) +struct wmGizmoGroup *CTX_wm_gizmo_group(const bContext *C) { - return C->wm.manipulator_group; + return C->wm.gizmo_group; } struct wmMsgBus *CTX_wm_message_bus(const bContext *C) @@ -876,9 +876,9 @@ void CTX_wm_menu_set(bContext *C, ARegion *menu) C->wm.menu = menu; } -void CTX_wm_manipulator_group_set(bContext *C, struct wmManipulatorGroup *mgroup) +void CTX_wm_gizmo_group_set(bContext *C, struct wmGizmoGroup *mgroup) { - C->wm.manipulator_group = mgroup; + C->wm.gizmo_group = mgroup; } void CTX_wm_operator_poll_msg_set(bContext *C, const char *msg) diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 8299d785cfc..6a8f46badd9 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -645,7 +645,7 @@ void BKE_scene_init(Scene *sce) sce->toolsettings->uvcalc_flag = UVCALC_TRANSFORM_CORRECT; sce->toolsettings->unwrapper = 1; sce->toolsettings->select_thresh = 0.01f; - sce->toolsettings->manipulator_flag = SCE_MANIP_TRANSLATE | SCE_MANIP_ROTATE | SCE_MANIP_SCALE; + sce->toolsettings->gizmo_flag = SCE_MANIP_TRANSLATE | SCE_MANIP_ROTATE | SCE_MANIP_SCALE; sce->toolsettings->selectmode = SCE_SELECT_VERTEX; sce->toolsettings->uv_selectmode = UV_SELECT_VERTEX; diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c index 1c8a93981c7..448b97c63b3 100644 --- a/source/blender/blenkernel/intern/screen.c +++ b/source/blender/blenkernel/intern/screen.c @@ -222,7 +222,7 @@ ARegion *BKE_area_region_copy(SpaceType *st, ARegion *ar) BLI_listbase_clear(&newar->panels_category_active); BLI_listbase_clear(&newar->ui_lists); newar->visible = 0; - newar->manipulator_map = NULL; + newar->gizmo_map = NULL; newar->regiontimer = NULL; newar->headerstr = NULL; newar->draw_buffer = NULL; @@ -324,18 +324,18 @@ void BKE_spacedata_id_unref(struct ScrArea *sa, struct SpaceLink *sl, struct ID } /** - * Avoid bad-level calls to #WM_manipulatormap_tag_refresh. + * Avoid bad-level calls to #WM_gizmomap_tag_refresh. */ -static void (*region_refresh_tag_manipulatormap_callback)(struct wmManipulatorMap *) = NULL; +static void (*region_refresh_tag_gizmomap_callback)(struct wmGizmoMap *) = NULL; -void BKE_region_callback_refresh_tag_manipulatormap_set(void (*callback)(struct wmManipulatorMap *)) +void BKE_region_callback_refresh_tag_gizmomap_set(void (*callback)(struct wmGizmoMap *)) { - region_refresh_tag_manipulatormap_callback = callback; + region_refresh_tag_gizmomap_callback = callback; } -void BKE_screen_manipulator_tag_refresh(struct bScreen *sc) +void BKE_screen_gizmo_tag_refresh(struct bScreen *sc) { - if (region_refresh_tag_manipulatormap_callback == NULL) { + if (region_refresh_tag_gizmomap_callback == NULL) { return; } @@ -343,21 +343,21 @@ void BKE_screen_manipulator_tag_refresh(struct bScreen *sc) ARegion *ar; for (sa = sc->areabase.first; sa; sa = sa->next) { for (ar = sa->regionbase.first; ar; ar = ar->next) { - if (ar->manipulator_map != NULL) { - region_refresh_tag_manipulatormap_callback(ar->manipulator_map); + if (ar->gizmo_map != NULL) { + region_refresh_tag_gizmomap_callback(ar->gizmo_map); } } } } /** - * Avoid bad-level calls to #WM_manipulatormap_delete. + * Avoid bad-level calls to #WM_gizmomap_delete. */ -static void (*region_free_manipulatormap_callback)(struct wmManipulatorMap *) = NULL; +static void (*region_free_gizmomap_callback)(struct wmGizmoMap *) = NULL; -void BKE_region_callback_free_manipulatormap_set(void (*callback)(struct wmManipulatorMap *)) +void BKE_region_callback_free_gizmomap_set(void (*callback)(struct wmGizmoMap *)) { - region_free_manipulatormap_callback = callback; + region_free_gizmomap_callback = callback; } static void panel_list_free(ListBase *lb) @@ -414,8 +414,8 @@ void BKE_area_region_free(SpaceType *st, ARegion *ar) } } - if (ar->manipulator_map != NULL) { - region_free_manipulatormap_callback(ar->manipulator_map); + if (ar->gizmo_map != NULL) { + region_free_gizmomap_callback(ar->gizmo_map); } BLI_freelistN(&ar->ui_lists); -- cgit v1.2.3