WM: rename manipulator to gizmo internally

1 files changed, 17 insertions, 17 deletions

diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index a87a68392c7..1149b910947 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -646,13 +646,13 @@ static void node_main_region_init(wmWindowManager *wm, ARegion *ar)
 
 	UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_CUSTOM, ar->winx, ar->winy);
 
-	/* manipulators stay in the background for now - quick patchjob to make sure nodes themselves work */
-	if (ar->manipulator_map == NULL) {
-		ar->manipulator_map = WM_manipulatormap_new_from_type(
-		        &(const struct wmManipulatorMapType_Params){SPACE_NODE, RGN_TYPE_WINDOW});
+	/* gizmos stay in the background for now - quick patchjob to make sure nodes themselves work */
+	if (ar->gizmo_map == NULL) {
+		ar->gizmo_map = WM_gizmomap_new_from_type(
+		        &(const struct wmGizmoMapType_Params){SPACE_NODE, RGN_TYPE_WINDOW});
 	}
 
-	WM_manipulatormap_add_handlers(ar, ar->manipulator_map);
+	WM_gizmomap_add_handlers(ar, ar->gizmo_map);
 
 	/* own keymaps */
 	keymap = WM_keymap_find(wm->defaultconf, "Node Generic", SPACE_NODE, 0);
@@ -752,7 +752,7 @@ static void node_region_listener(
         wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
         wmNotifier *wmn, const Scene *UNUSED(scene))
 {
-	wmManipulatorMap *mmap = ar->manipulator_map;
+	wmGizmoMap *mmap = ar->gizmo_map;
 
 	/* context changes */
 	switch (wmn->category) {
@@ -762,13 +762,13 @@ static void node_region_listener(
 					ED_region_tag_redraw(ar);
 					break;
 				case ND_SPACE_NODE_VIEW:
-					WM_manipulatormap_tag_refresh(mmap);
+					WM_gizmomap_tag_refresh(mmap);
 					break;
 			}
 			break;
 		case NC_SCREEN:
 			if (wmn->data == ND_LAYOUTSET || wmn->action == NA_EDITED) {
-				WM_manipulatormap_tag_refresh(mmap);
+				WM_gizmomap_tag_refresh(mmap);
 			}
 			switch (wmn->data) {
 				case ND_ANIMPLAY:
@@ -784,13 +784,13 @@ static void node_region_listener(
 		case NC_SCENE:
 			ED_region_tag_redraw(ar);
 			if (wmn->data == ND_RENDER_RESULT) {
-				WM_manipulatormap_tag_refresh(mmap);
+				WM_gizmomap_tag_refresh(mmap);
 			}
 			break;
 		case NC_NODE:
 			ED_region_tag_redraw(ar);
 			if (ELEM(wmn->action, NA_EDITED, NA_SELECTED)) {
-				WM_manipulatormap_tag_refresh(mmap);
+				WM_gizmomap_tag_refresh(mmap);
 			}
 			break;
 		case NC_MATERIAL:
@@ -863,12 +863,12 @@ static int node_context(const bContext *C, const char *member, bContextDataResul
 static void node_widgets(void)
 {
 	/* create the widgetmap for the area here */
-	wmManipulatorMapType *mmap_type = WM_manipulatormaptype_ensure(
-	        &(const struct wmManipulatorMapType_Params){SPACE_NODE, RGN_TYPE_WINDOW});
-	WM_manipulatorgrouptype_append_and_link(mmap_type, NODE_WGT_backdrop_transform);
-	WM_manipulatorgrouptype_append_and_link(mmap_type, NODE_WGT_backdrop_crop);
-	WM_manipulatorgrouptype_append_and_link(mmap_type, NODE_WGT_backdrop_sun_beams);
-	WM_manipulatorgrouptype_append_and_link(mmap_type, NODE_WGT_backdrop_corner_pin);
+	wmGizmoMapType *mmap_type = WM_gizmomaptype_ensure(
+	        &(const struct wmGizmoMapType_Params){SPACE_NODE, RGN_TYPE_WINDOW});
+	WM_gizmogrouptype_append_and_link(mmap_type, NODE_WGT_backdrop_transform);
+	WM_gizmogrouptype_append_and_link(mmap_type, NODE_WGT_backdrop_crop);
+	WM_gizmogrouptype_append_and_link(mmap_type, NODE_WGT_backdrop_sun_beams);
+	WM_gizmogrouptype_append_and_link(mmap_type, NODE_WGT_backdrop_corner_pin);
 }
 
 static void node_id_remap(ScrArea *UNUSED(sa), SpaceLink *slink, ID *old_id, ID *new_id)
@@ -987,7 +987,7 @@ void ED_spacetype_node(void)
 	st->refresh = node_area_refresh;
 	st->context = node_context;
 	st->dropboxes = node_dropboxes;
-	st->manipulators = node_widgets;
+	st->gizmos = node_widgets;
 	st->id_remap = node_id_remap;
 	st->space_subtype_item_extend = node_space_subtype_item_extend;
 	st->space_subtype_get = node_space_subtype_get;