Cleanup: redundant header, use const, short -> bool

diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h
index b39b4bd81ee038c22a13b63d241eb759361fa318..190b061005990e8bcd4db8007b321a2c63560f5e 100644 (file)
--- a/source/blender/editors/armature/armature_intern.h
+++ b/source/blender/editors/armature/armature_intern.h
@@ -247,8 +247,10 @@ void armature_select_mirrored_ex(struct bArmature *arm, const int flag);
 void armature_select_mirrored(struct bArmature *arm);
 void armature_tag_unselect(struct bArmature *arm);
 
-void *get_nearest_bone(struct bContext *C, short findunsel, int x, int y);
-void *get_bone_from_selectbuffer(struct Scene *scene, struct Base *base, unsigned int *buffer, short hits, short findunsel, bool do_nearest);
+void *get_nearest_bone(struct bContext *C, const int xy[2], bool findunsel);
+void *get_bone_from_selectbuffer(
+        struct Scene *scene, struct Base *base, const unsigned int *buffer, short hits,
+        bool findunsel, bool do_nearest);
 
 int bone_looper(struct Object *ob, struct Bone *bone, void *data,
                 int (*bone_func)(struct Object *, struct Bone *, void *));

diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c
index e9946abba0b7fa45162639f0895aeb3e5d75dacf..5696c1f8a01adaaa7bcb5b211028a450a821ebb6 100644 (file)
--- a/source/blender/editors/armature/armature_select.c
+++ b/source/blender/editors/armature/armature_select.c
@@ -74,7 +74,9 @@ Bone *get_indexed_bone(Object *ob, int index)
 
 /* See if there are any selected bones in this buffer */
 /* only bones from base are checked on */
-void *get_bone_from_selectbuffer(Scene *scene, Base *base, unsigned int *buffer, short hits, short findunsel, bool do_nearest)
+void *get_bone_from_selectbuffer(
+        Scene *scene, Base *base, const unsigned int *buffer, short hits,
+        bool findunsel, bool do_nearest)
 {
        Object *obedit = scene->obedit; // XXX get from context
        Bone *bone;
@@ -103,8 +105,8 @@ void *get_bone_from_selectbuffer(Scene *scene, Base *base, unsigned int *buffer,
                                                        sel = (bone->flag & BONE_SELECTED);
                                                else
                                                        sel = !(bone->flag & BONE_SELECTED);
-                                               
-                                               data = bone;                                            
+
+                                               data = bone;
                                        }
                                        else {
                                                data = NULL;
@@ -162,7 +164,7 @@ void *get_bone_from_selectbuffer(Scene *scene, Base *base, unsigned int *buffer,
 /* used by posemode as well editmode */
 /* only checks scene->basact! */
 /* x and y are mouse coords (area space) */
-void *get_nearest_bone(bContext *C, short findunsel, int x, int y)
+void *get_nearest_bone(bContext *C, const int xy[2], bool findunsel)
 {
        ViewContext vc;
        rcti rect;
@@ -172,8 +174,8 @@ void *get_nearest_bone(bContext *C, short findunsel, int x, int y)
        view3d_set_viewcontext(C, &vc);
        
        // rect.xmin = ... mouseco!
-       rect.xmin = rect.xmax = x;
-       rect.ymin = rect.ymax = y;
+       rect.xmin = rect.xmax = xy[0];
+       rect.ymin = rect.ymax = xy[1];
        
        hits = view3d_opengl_select(&vc, buffer, MAXPICKBUF, &rect, true);
 
@@ -197,10 +199,7 @@ static int armature_select_linked_invoke(bContext *C, wmOperator *op, const wmEv
 
        view3d_operator_needs_opengl(C);
 
-       if (extend)
-               bone = get_nearest_bone(C, 0, event->mval[0], event->mval[1]);
-       else
-               bone = get_nearest_bone(C, 1, event->mval[0], event->mval[1]);
+       bone = get_nearest_bone(C, event->mval, !extend);
 
        if (!bone)
                return OPERATOR_CANCELLED;
@@ -278,8 +277,9 @@ void ARMATURE_OT_select_linked(wmOperatorType *ot)
 
 /* does bones and points */
 /* note that BONE ROOT only gets drawn for root bones (or without IK) */
-static EditBone *get_nearest_editbonepoint(ViewContext *vc, const int mval[2],
-                                           ListBase *edbo, int findunsel, int *selmask)
+static EditBone *get_nearest_editbonepoint(
+        ViewContext *vc, const int mval[2],
+        ListBase *edbo, bool findunsel, int *r_selmask)
 {
        bArmature *arm = (bArmature *)vc->obedit->data;
        EditBone *ebone_next_act = arm->act_edbone;
@@ -375,17 +375,17 @@ static EditBone *get_nearest_editbonepoint(ViewContext *vc, const int mval[2],
                        
                        ebone = BLI_findlink(edbo, besthitresult & ~BONESEL_ANY);
                        
-                       *selmask = 0;
+                       *r_selmask = 0;
                        if (besthitresult & BONESEL_ROOT)
-                               *selmask |= BONE_ROOTSEL;
+                               *r_selmask |= BONE_ROOTSEL;
                        if (besthitresult & BONESEL_TIP)
-                               *selmask |= BONE_TIPSEL;
+                               *r_selmask |= BONE_TIPSEL;
                        if (besthitresult & BONESEL_BONE)
-                               *selmask |= BONE_SELECTED;
+                               *r_selmask |= BONE_SELECTED;
                        return ebone;
                }
        }
-       *selmask = 0;
+       *r_selmask = 0;
        return NULL;
 }
 
@@ -439,8 +439,8 @@ bool ED_armature_select_pick(bContext *C, const int mval[2], bool extend, bool d
        if (BIF_sk_selectStroke(C, mval, extend)) {
                return true;
        }
-       
-       nearBone = get_nearest_editbonepoint(&vc, mval, arm->edbo, 1, &selmask);
+
+       nearBone = get_nearest_editbonepoint(&vc, mval, arm->edbo, true, &selmask);
        if (nearBone) {
 
                if (!extend && !deselect && !toggle) {
@@ -1202,7 +1202,7 @@ static int armature_shortest_path_pick_invoke(bContext *C, wmOperator *op, const
        view3d_operator_needs_opengl(C);
 
        ebone_src = arm->act_edbone;
-       ebone_dst = get_nearest_bone(C, 0, event->mval[0], event->mval[1]);
+       ebone_dst = get_nearest_bone(C, event->mval, false);
 
        /* fallback to object selection */
        if (ELEM(NULL, ebone_src, ebone_dst) || (ebone_src == ebone_dst)) {

diff --git a/source/blender/editors/armature/pose_select.c b/source/blender/editors/armature/pose_select.c
index 44470c1f827bce9baf8212c61a3cdd245b404cee..6e3285524110de40faa5319539308bef183dbd59 100644 (file)
--- a/source/blender/editors/armature/pose_select.c
+++ b/source/blender/editors/armature/pose_select.c
@@ -132,8 +132,9 @@ void ED_pose_bone_select(Object *ob, bPoseChannel *pchan, bool select)
 
 /* called from editview.c, for mode-less pose selection */
 /* assumes scene obact and basact is still on old situation */
-int ED_do_pose_selectbuffer(Scene *scene, Base *base, unsigned int *buffer, short hits,
-                            bool extend, bool deselect, bool toggle, bool do_nearest)
+bool ED_do_pose_selectbuffer(
+        Scene *scene, Base *base, const unsigned int *buffer, short hits,
+        bool extend, bool deselect, bool toggle, bool do_nearest)
 {
        Object *ob = base->object;
        Bone *nearBone;
@@ -280,12 +281,9 @@ static int pose_select_connected_invoke(bContext *C, wmOperator *op, const wmEve
        const bool extend = RNA_boolean_get(op->ptr, "extend");
 
        view3d_operator_needs_opengl(C);
-       
-       if (extend)
-               bone = get_nearest_bone(C, 0, event->mval[0], event->mval[1]);
-       else
-               bone = get_nearest_bone(C, 1, event->mval[0], event->mval[1]);
-       
+
+       bone = get_nearest_bone(C, event->mval, !extend);
+
        if (!bone)
                return OPERATOR_CANCELLED;
        

diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h
index 7ad61671b1b07e243171eaba0e76ac15c25571fa..6b8943421bdd3dd776d752207d3a869da8915a01 100644 (file)
--- a/source/blender/editors/include/ED_armature.h
+++ b/source/blender/editors/include/ED_armature.h
@@ -130,8 +130,9 @@ void ED_armature_ebone_listbase_temp_clear(struct ListBase *lb);
 void ED_armature_deselect_all(struct Object *obedit);
 void ED_armature_deselect_all_visible(struct Object *obedit);
 
-int ED_do_pose_selectbuffer(struct Scene *scene, struct Base *base, unsigned int *buffer,
-                            short hits, bool extend, bool deselect, bool toggle, bool do_nearest);
+bool ED_do_pose_selectbuffer(
+        struct Scene *scene, struct Base *base, const unsigned int *buffer, short hits,
+        bool extend, bool deselect, bool toggle, bool do_nearest);
 bool ED_armature_select_pick(struct bContext *C, const int mval[2], bool extend, bool deselect, bool toggle);
 int join_armature_exec(struct bContext *C, struct wmOperator *op);
 struct Bone *get_indexed_bone(struct Object *ob, int index);

diff --git a/source/blender/gpu/GPU_select.h b/source/blender/gpu/GPU_select.h
index 6a16b5b7456145d5d222d057cd82ed3e199b2e4d..d3cb914976ed069ad935a45ae29a6b9c0649fccf 100644 (file)
--- a/source/blender/gpu/GPU_select.h
+++ b/source/blender/gpu/GPU_select.h
@@ -30,9 +30,10 @@
 #ifndef __GPU_SELECT_H__
 #define __GPU_SELECT_H__
 
-#include "DNA_vec_types.h"  /* rcft */
 #include "BLI_sys_types.h"
 
+struct rctf;
+
 /* flags for mode of operation */
 enum {
        GPU_SELECT_ALL                      = 1,
@@ -40,7 +41,7 @@ enum {
        GPU_SELECT_NEAREST_SECOND_PASS      = 3,
 };
 
-void GPU_select_begin(unsigned int *buffer, unsigned int bufsize, rctf *input, char mode, int oldhits);
+void GPU_select_begin(unsigned int *buffer, unsigned int bufsize, const struct rctf *input, char mode, int oldhits);
 bool GPU_select_load_id(unsigned int id);
 unsigned int GPU_select_end(void);
 bool GPU_select_query_check_active(void);

diff --git a/source/blender/gpu/intern/gpu_select.c b/source/blender/gpu/intern/gpu_select.c
index 58582232cd569b8b5dc5819ffc5b9bd50ff99c6b..209496927dee096484cd7a1896cf62329d5a18de 100644 (file)
--- a/source/blender/gpu/intern/gpu_select.c
+++ b/source/blender/gpu/intern/gpu_select.c
@@ -72,7 +72,7 @@ static GPUQueryState g_query_state = {0};
 /**
  * initialize and provide buffer for results
  */
-void GPU_select_begin(unsigned int *buffer, unsigned int bufsize, rctf *input, char mode, int oldhits)
+void GPU_select_begin(unsigned int *buffer, unsigned int bufsize, const rctf *input, char mode, int oldhits)
 {
        g_query_state.select_is_active = true;
        g_query_state.query_issued = false;