blender
/
blender
134
399
Fork 583
Code Issues 6.3k Pull Requests 755 Projects 19 Wiki Activity

Manipulator: name remove func's 'unlink_delayed' 

Name wasn't right since this only unlinks from manipulator maps.
This commit is contained in:
Campbell Barton 2017-10-22 00:17:47 +11:00
parent d3fafa3002
commit bf26509855
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/mesh/editmesh_bisect.c
View File

@ -596,7 +596,7 @@ static bool manipulator_mesh_bisect_poll(const bContext *C, wmManipulatorGroupTy
{
wmOperator *op = WM_operator_last_redo(C);
if (op == NULL || !STREQ(op->type->idname, "MESH_OT_bisect")) {
WM_manipulator_group_type_remove_ptr_delayed(wgt);
WM_manipulator_group_type_unlink_delayed_ptr(wgt);
return false;
}
return true;

2
source/blender/editors/mesh/editmesh_extrude.c
View File

@ -1063,7 +1063,7 @@ static bool manipulator_mesh_spin_poll(const bContext *C, wmManipulatorGroupType
{
wmOperator *op = WM_operator_last_redo(C);
if (op == NULL || !STREQ(op->type->idname, "MESH_OT_spin")) {
WM_manipulator_group_type_remove_ptr_delayed(wgt);
WM_manipulator_group_type_unlink_delayed_ptr(wgt);
return false;
}
return true;

2
source/blender/editors/transform/transform_manipulator.c
View File

@ -1463,7 +1463,7 @@ static bool WIDGETGROUP_xform_cage_poll(const bContext *C, wmManipulatorGroupTyp
{
WorkSpace *workspace = CTX_wm_workspace(C);
if (!STREQ(wgt->idname, workspace->tool.manipulator_group)) {
WM_manipulator_group_type_remove_ptr_delayed(wgt);
WM_manipulator_group_type_unlink_delayed_ptr(wgt);
return false;
}
return true;

6
source/blender/windowmanager/manipulators/WM_manipulator_api.h
View File

@ -297,12 +297,12 @@ void WM_manipulator_group_type_remove_ptr(
struct Main *bmain, struct wmManipulatorGroupType *wgt);
void WM_manipulator_group_type_remove(struct Main *bmain, const char *idname);
void WM_manipulator_group_type_remove_ptr_delayed_ex(
void WM_manipulator_group_type_unlink_delayed_ptr_ex(
struct wmManipulatorGroupType *wgt,
struct wmManipulatorMapType *mmap_type);
void WM_manipulator_group_type_remove_ptr_delayed(
void WM_manipulator_group_type_unlink_delayed_ptr(
struct wmManipulatorGroupType *wgt);
void WM_manipulator_group_type_remove_delayed(const char *idname);
void WM_manipulator_group_type_unlink_delayed(const char *idname);
/* Utilities */
void WM_manipulator_group_type_is_any_selected(const char *idname);

10
source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
View File

@ -757,25 +757,25 @@ void WM_manipulator_group_type_remove(struct Main *bmain, const char *idname)
/* delayed versions */
void WM_manipulator_group_type_remove_ptr_delayed_ex(
void WM_manipulator_group_type_unlink_delayed_ptr_ex(
wmManipulatorGroupType *wgt,
wmManipulatorMapType *mmap_type)
{
WM_manipulatorconfig_update_tag_remove(mmap_type, wgt);
}
void WM_manipulator_group_type_remove_ptr_delayed(
void WM_manipulator_group_type_unlink_delayed_ptr(
wmManipulatorGroupType *wgt)
{
wmManipulatorMapType *mmap_type = WM_manipulatormaptype_ensure(&wgt->mmap_params);
WM_manipulator_group_type_remove_ptr_delayed_ex(wgt, mmap_type);
WM_manipulator_group_type_unlink_delayed_ptr_ex(wgt, mmap_type);
}
void WM_manipulator_group_type_remove_delayed(const char *idname)
void WM_manipulator_group_type_unlink_delayed(const char *idname)
{
wmManipulatorGroupType *wgt = WM_manipulatorgrouptype_find(idname, false);
BLI_assert(wgt != NULL);
WM_manipulator_group_type_remove_ptr_delayed(wgt);
WM_manipulator_group_type_unlink_delayed_ptr(wgt);
}
/** \} */