tidy up

- quiet some warnings
- set some functions static
- replace materialbyname with generic BLI_findstring call

3 files changed, 9 insertions, 10 deletions

diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c
index fbe336b3493..566ff09c366 100644
--- a/source/blender/editors/armature/editarmature.c
+++ b/source/blender/editors/armature/editarmature.c
@@ -4298,7 +4298,7 @@ int ED_do_pose_selectbuffer(Scene *scene, Base *base, unsigned int *buffer, shor
 		 * note, special exception for armature mode so we can do multi-select
 		 * we could check for multi-select explicitly but think its fine to
 		 * always give pradictable behavior in weight paint mode - campbell */
-		if (!(extend) || (base->object != ob_act && !(ob_act->mode & OB_MODE_WEIGHT_PAINT))) {
+		if (!(extend) || ((ob_act && ob_act->mode & OB_MODE_WEIGHT_PAINT) == 0)) {
 			ED_pose_deselectall(ob, 0);
 			nearBone->flag |= (BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
 			arm->act_bone= nearBone;
diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c
index 539e975095e..5b72e87f95a 100644
--- a/source/blender/editors/sound/sound_ops.c
+++ b/source/blender/editors/sound/sound_ops.c
@@ -436,7 +436,7 @@ static void mixdown_draw(bContext *C, wmOperator *op)
 }
 #endif // WITH_AUDASPACE
 
-void SOUND_OT_mixdown(wmOperatorType *ot)
+static void SOUND_OT_mixdown(wmOperatorType *ot)
 {
 #ifdef WITH_AUDASPACE
 	static EnumPropertyItem format_items[] = {
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index aa3166a7a65..d2c7ae33729 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -1976,17 +1976,18 @@ static int vertsel_vert_pick(struct bContext *C, Mesh *me, const int mval[2], un
 
 /* mouse selection in weight paint */
 /* gets called via generic mouse select operator */
-int mouse_wp_select(bContext *C, const int mval[2], short extend, Object *obact, Mesh* me)
+static int mouse_weight_paint_vertex_select(bContext *C, const int mval[2], short extend, Object *obact)
 {
+	Mesh* me= obact->data; /* already checked for NULL */
 	unsigned int index = 0;
 	MVert *mv;
 	if(vertsel_vert_pick(C, me, mval, &index, 1)) {
 		mv = me->mvert+index;
 		if(extend) {
-			mv->flag ^= 1;
+			mv->flag ^= SELECT;
 		} else {
 			paintvert_deselect_all_visible(obact, SEL_DESELECT, FALSE);
-			mv->flag |= 1;
+			mv->flag |= SELECT;
 		}
 		paintvert_flush_flags(obact);
 		WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obact->data);
@@ -2039,12 +2040,10 @@ static int view3d_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
 		return PE_mouse_particles(C, event->mval, extend);
 	else if(obact && paint_facesel_test(obact))
 		retval = paintface_mouse_select(C, obact, event->mval, extend);
-	
-	else if (paint_vertsel_test(obact)) {
-		retval = mouse_wp_select(C, event->mval, extend, obact, obact->data);
-	} else {
+	else if (paint_vertsel_test(obact))
+		retval = mouse_weight_paint_vertex_select(C, event->mval, extend, obact);
+	else
 		retval = mouse_select(C, event->mval, extend, center, enumerate);
-	}
 
 	/* passthrough allows tweaks
 	 * FINISHED to signal one operator worked