diff options
Diffstat (limited to 'source/blender/windowmanager/intern/wm_toolsystem.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_toolsystem.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/windowmanager/intern/wm_toolsystem.c b/source/blender/windowmanager/intern/wm_toolsystem.c index d06cc21ec21..350327e8590 100644 --- a/source/blender/windowmanager/intern/wm_toolsystem.c +++ b/source/blender/windowmanager/intern/wm_toolsystem.c @@ -131,8 +131,8 @@ static void toolsystem_unlink_ref(bContext *C, WorkSpace *workspace, bToolRef *t { bToolRef_Runtime *tref_rt = tref->runtime; - if (tref_rt->manipulator_group[0]) { - wmManipulatorGroupType *wgt = WM_manipulatorgrouptype_find(tref_rt->manipulator_group, false); + if (tref_rt->gizmo_group[0]) { + wmGizmoGroupType *wgt = WM_gizmogrouptype_find(tref_rt->gizmo_group, false); if (wgt != NULL) { bool found = false; @@ -144,7 +144,7 @@ static void toolsystem_unlink_ref(bContext *C, WorkSpace *workspace, bToolRef *t for (wmWindow *win = wm->windows.first; win; win = win->next) { const WorkSpace *workspace_iter = WM_window_get_active_workspace(win); if (workspace != workspace_iter) { - if (STREQ(workspace->tool.manipulator_group, workspace_iter->tool.manipulator_group)) { + if (STREQ(workspace->tool.gizmo_group, workspace_iter->tool.gizmo_group)) { found = true; break; } @@ -154,8 +154,8 @@ static void toolsystem_unlink_ref(bContext *C, WorkSpace *workspace, bToolRef *t UNUSED_VARS(workspace); #endif if (!found) { - wmManipulatorMapType *mmap_type = WM_manipulatormaptype_ensure(&wgt->mmap_params); - WM_manipulatormaptype_group_unlink(C, bmain, mmap_type, wgt); + wmGizmoMapType *mmap_type = WM_gizmomaptype_ensure(&wgt->mmap_params); + WM_gizmomaptype_group_unlink(C, bmain, mmap_type, wgt); } } } @@ -171,11 +171,11 @@ void WM_toolsystem_unlink(bContext *C, WorkSpace *workspace, const bToolKey *tke static void toolsystem_ref_link(bContext *C, WorkSpace *workspace, bToolRef *tref) { bToolRef_Runtime *tref_rt = tref->runtime; - if (tref_rt->manipulator_group[0]) { - const char *idname = tref_rt->manipulator_group; - wmManipulatorGroupType *wgt = WM_manipulatorgrouptype_find(idname, false); + if (tref_rt->gizmo_group[0]) { + const char *idname = tref_rt->gizmo_group; + wmGizmoGroupType *wgt = WM_gizmogrouptype_find(idname, false); if (wgt != NULL) { - WM_manipulator_group_type_ensure_ptr(wgt); + WM_gizmo_group_type_ensure_ptr(wgt); } else { CLOG_WARN(WM_LOG_TOOLS, "'%s' widget not found", idname); |