From d59079c5e1b40cfd650cf470ef223928bd304e8f Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Sun, 16 Oct 2016 15:19:18 +0200 Subject: Cleanup: Unused parameters in Outliner These were only passed to own recursion calls. --- .../blender/editors/space_outliner/outliner_draw.c | 30 ++++++++++------------ 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'source/blender/editors/space_outliner/outliner_draw.c') diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index bc2e9c80b40..33a5a7ca7b7 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -155,7 +155,7 @@ static void restrictbutton_recursive_ebone(bContext *C, EditBone *ebone_parent, } } -static void restrictbutton_recursive_bone(bContext *C, bArmature *arm, Bone *bone_parent, int flag, bool set_flag) +static void restrictbutton_recursive_bone(Bone *bone_parent, int flag, bool set_flag) { Bone *bone; for (bone = bone_parent->childbase.first; bone; bone = bone->next) { @@ -166,7 +166,7 @@ static void restrictbutton_recursive_bone(bContext *C, bArmature *arm, Bone *bon else { bone->flag &= ~flag; } - restrictbutton_recursive_bone(C, arm, bone, flag, set_flag); + restrictbutton_recursive_bone(bone, flag, set_flag); } } @@ -294,29 +294,27 @@ static void restrictbutton_modifier_cb(bContext *C, void *UNUSED(poin), void *po WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob); } -static void restrictbutton_bone_visibility_cb(bContext *C, void *poin, void *poin2) +static void restrictbutton_bone_visibility_cb(bContext *C, void *UNUSED(poin), void *poin2) { - bArmature *arm = (bArmature *)poin; Bone *bone = (Bone *)poin2; if (bone->flag & BONE_HIDDEN_P) bone->flag &= ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL); if (CTX_wm_window(C)->eventstate->ctrl) { - restrictbutton_recursive_bone(C, arm, bone, BONE_HIDDEN_P, (bone->flag & BONE_HIDDEN_P) != 0); + restrictbutton_recursive_bone(bone, BONE_HIDDEN_P, (bone->flag & BONE_HIDDEN_P) != 0); } WM_event_add_notifier(C, NC_OBJECT | ND_POSE, NULL); } -static void restrictbutton_bone_select_cb(bContext *C, void *poin, void *poin2) +static void restrictbutton_bone_select_cb(bContext *C, void *UNUSED(poin), void *poin2) { - bArmature *arm = (bArmature *)poin; Bone *bone = (Bone *)poin2; if (bone->flag & BONE_UNSELECTABLE) bone->flag &= ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL); if (CTX_wm_window(C)->eventstate->ctrl) { - restrictbutton_recursive_bone(C, arm, bone, BONE_UNSELECTABLE, (bone->flag & BONE_UNSELECTABLE) != 0); + restrictbutton_recursive_bone(bone, BONE_UNSELECTABLE, (bone->flag & BONE_UNSELECTABLE) != 0); } WM_event_add_notifier(C, NC_OBJECT | ND_POSE, NULL); @@ -893,7 +891,7 @@ static void outliner_draw_rnacols(ARegion *ar, int sizex) miny); } -static void outliner_draw_rnabuts(uiBlock *block, Scene *scene, ARegion *ar, SpaceOops *soops, int sizex, ListBase *lb) +static void outliner_draw_rnabuts(uiBlock *block, ARegion *ar, SpaceOops *soops, int sizex, ListBase *lb) { TreeElement *te; TreeStoreElem *tselem; @@ -932,7 +930,7 @@ static void outliner_draw_rnabuts(uiBlock *block, Scene *scene, ARegion *ar, Spa } } - if (TSELEM_OPEN(tselem, soops)) outliner_draw_rnabuts(block, scene, ar, soops, sizex, &te->subtree); + if (TSELEM_OPEN(tselem, soops)) outliner_draw_rnabuts(block, ar, soops, sizex, &te->subtree); } UI_block_emboss_set(block, UI_EMBOSS); @@ -1414,7 +1412,7 @@ static void outliner_draw_iconrow(bContext *C, uiBlock *block, Scene *scene, Spa } /* closed tree element */ -static void outliner_set_coord_tree_element(SpaceOops *soops, TreeElement *te, int startx, int starty) +static void outliner_set_coord_tree_element(TreeElement *te, int startx, int starty) { TreeElement *ten; @@ -1423,7 +1421,7 @@ static void outliner_set_coord_tree_element(SpaceOops *soops, TreeElement *te, i te->ys = starty; for (ten = te->subtree.first; ten; ten = ten->next) { - outliner_set_coord_tree_element(soops, ten, startx + UI_UNIT_X, starty); + outliner_set_coord_tree_element(ten, startx + UI_UNIT_X, starty); } } @@ -1649,7 +1647,7 @@ static void outliner_draw_tree_element( } else { for (ten = te->subtree.first; ten; ten = ten->next) { - outliner_set_coord_tree_element(soops, ten, startx, *starty); + outliner_set_coord_tree_element(ten, startx, *starty); } *starty -= UI_UNIT_Y; @@ -1690,7 +1688,7 @@ static void outliner_draw_hierarchy(SpaceOops *soops, ListBase *lb, int startx, } } -static void outliner_draw_struct_marks(ARegion *ar, SpaceOops *soops, ListBase *lb, int *starty) +static void outliner_draw_struct_marks(ARegion *ar, SpaceOops *soops, ListBase *lb, int *starty) { TreeElement *te; TreeStoreElem *tselem; @@ -1712,7 +1710,7 @@ static void outliner_draw_struct_marks(ARegion *ar, SpaceOops *soops, ListBase * } } -static void outliner_draw_selection(ARegion *ar, SpaceOops *soops, ListBase *lb, int *starty) +static void outliner_draw_selection(ARegion *ar, SpaceOops *soops, ListBase *lb, int *starty) { TreeElement *te; TreeStoreElem *tselem; @@ -1889,7 +1887,7 @@ void draw_outliner(const bContext *C) if (ELEM(soops->outlinevis, SO_DATABLOCKS, SO_USERDEF)) { /* draw rna buttons */ outliner_draw_rnacols(ar, sizex_rna); - outliner_draw_rnabuts(block, scene, ar, soops, sizex_rna, &soops->tree); + outliner_draw_rnabuts(block, ar, soops, sizex_rna, &soops->tree); } else if ((soops->outlinevis == SO_ID_ORPHANS) && !(soops->flag & SO_HIDE_RESTRICTCOLS)) { /* draw user toggle columns */ -- cgit v1.2.3