made most variables which are only used in a single file and not defined in header static for blenlib, blenkernel and editors.

8 files changed, 31 insertions, 26 deletions

diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c
index 0b3e116d266..a5edc7d2598 100644
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@@ -67,6 +67,8 @@
 
 #include "ED_object.h"
 
+#include "object_intern.h"
+
 /* ****************** render BAKING ********************** */
 
 /* threaded break test */
@@ -117,7 +119,7 @@ typedef struct BakeRender {
 } BakeRender;
 
 /* use by exec and invoke */
-int test_bake_internal(bContext *C, ReportList *reports)
+static int test_bake_internal(bContext *C, ReportList *reports)
 {
 	Scene *scene= CTX_data_scene(C);
 
diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c
index f3346bf200c..2358df37806 100644
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -140,7 +140,7 @@ bConstraint *get_active_constraint (Object *ob)
 /* ------------- PyConstraints ------------------ */
 
 /* this callback sets the text-file to be used for selected menu item */
-void validate_pyconstraint_cb (void *arg1, void *arg2)
+static void validate_pyconstraint_cb (void *arg1, void *arg2)
 {
 	bPythonConstraint *data = arg1;
 	Text *text= NULL;
@@ -157,7 +157,7 @@ void validate_pyconstraint_cb (void *arg1, void *arg2)
 
 #ifdef WITH_PYTHON
 /* this returns a string for the list of usable pyconstraint script names */
-char *buildmenu_pyconstraints (Text *con_text, int *pyconindex)
+static char *buildmenu_pyconstraints (Text *con_text, int *pyconindex)
 {
 	DynStr *pupds= BLI_dynstr_new();
 	Text *text;
@@ -199,7 +199,7 @@ char *buildmenu_pyconstraints (Text *con_text, int *pyconindex)
 #endif /* WITH_PYTHON */
 
 /* this callback gets called when the 'refresh' button of a pyconstraint gets pressed */
-void update_pyconstraint_cb (void *arg1, void *arg2)
+static void update_pyconstraint_cb (void *arg1, void *arg2)
 {
 #ifndef WITH_PYTHON
 	(void)arg1; /* unused */
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index bb83827b2cb..28566dcda07 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -592,7 +592,7 @@ void OBJECT_OT_posemode_toggle(wmOperatorType *ot)
 
 /* *********************** */
 
-void check_editmode(int type)
+static void check_editmode(int type)
 {
 	Object *obedit= NULL; // XXX
 	
@@ -725,7 +725,7 @@ static void spot_interactive(Object *ob, int mode)
 }
 #endif
 
-void special_editmenu(Scene *scene, View3D *v3d)
+static void special_editmenu(Scene *scene, View3D *v3d)
 {
 // XXX	static short numcuts= 2;
 	Object *ob= OBACT;
@@ -1200,7 +1200,7 @@ static void copy_texture_space(Object *to, Object *ob)
 	
 }
 
-void copy_attr(Main *bmain, Scene *scene, View3D *v3d, short event)
+static void copy_attr(Main *bmain, Scene *scene, View3D *v3d, short event)
 {
 	Object *ob;
 	Base *base;
@@ -1448,7 +1448,7 @@ void copy_attr(Main *bmain, Scene *scene, View3D *v3d, short event)
 	DAG_ids_flush_update(bmain, 0);
 }
 
-void copy_attr_menu(Main *bmain, Scene *scene, View3D *v3d)
+static void copy_attr_menu(Main *bmain, Scene *scene, View3D *v3d)
 {
 	Object *ob;
 	short event;
@@ -1719,7 +1719,7 @@ void OBJECT_OT_shade_smooth(wmOperatorType *ot)
 
 /* ********************** */
 
-void image_aspect(Scene *scene, View3D *v3d)
+static void image_aspect(Scene *scene, View3D *v3d)
 {
 	/* all selected objects with an image map: scale in image aspect */
 	Base *base;
@@ -1778,7 +1778,7 @@ void image_aspect(Scene *scene, View3D *v3d)
 	
 }
 
-int vergbaseco(const void *a1, const void *a2)
+static int vergbaseco(const void *a1, const void *a2)
 {
 	Base **x1, **x2;
 	
@@ -1794,7 +1794,7 @@ int vergbaseco(const void *a1, const void *a2)
 }
 
 
-void auto_timeoffs(Scene *scene, View3D *v3d)
+static void auto_timeoffs(Scene *scene, View3D *v3d)
 {
 	Base *base, **basesort, **bs;
 	float start, delta;
@@ -1835,7 +1835,7 @@ void auto_timeoffs(Scene *scene, View3D *v3d)
 
 }
 
-void ofs_timeoffs(Scene *scene, View3D *v3d)
+static void ofs_timeoffs(Scene *scene, View3D *v3d)
 {
 	float offset=0.0f;
 
@@ -1854,7 +1854,7 @@ void ofs_timeoffs(Scene *scene, View3D *v3d)
 }
 
 
-void rand_timeoffs(Scene *scene, View3D *v3d)
+static void rand_timeoffs(Scene *scene, View3D *v3d)
 {
 	Base *base;
 	float rand_ofs=0.0f;
diff --git a/source/blender/editors/object/object_lattice.c b/source/blender/editors/object/object_lattice.c
index 3647d32c28d..375ea82c0b7 100644
--- a/source/blender/editors/object/object_lattice.c
+++ b/source/blender/editors/object/object_lattice.c
@@ -49,6 +49,8 @@
 #include "BKE_lattice.h"
 #include "BKE_mesh.h"
 
+#include "ED_lattice.h"
+#include "ED_object.h"
 #include "ED_screen.h"
 #include "ED_view3d.h"
 #include "ED_util.h"
@@ -181,7 +183,7 @@ void ED_setflagsLatt(Object *obedit, int flag)
 	}
 }
 
-int select_all_exec(bContext *C, wmOperator *op)
+static int select_all_exec(bContext *C, wmOperator *op)
 {
 	Object *obedit= CTX_data_edit_object(C);
 	Lattice *lt= obedit->data;
@@ -248,7 +250,7 @@ void LATTICE_OT_select_all(wmOperatorType *ot)
 	WM_operator_properties_select_all(ot);
 }
 
-int make_regular_poll(bContext *C)
+static int make_regular_poll(bContext *C)
 {
 	Object *ob;
 
@@ -258,7 +260,7 @@ int make_regular_poll(bContext *C)
 	return (ob && ob->type==OB_LATTICE);
 }
 
-int make_regular_exec(bContext *C, wmOperator *UNUSED(op))
+static int make_regular_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Object *ob= CTX_data_edit_object(C);
 	Lattice *lt;
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 0f8e5cec21b..d64fc4960bd 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -1156,7 +1156,7 @@ void OBJECT_OT_move_to_layer(wmOperatorType *ot)
 
 /************************** Link to Scene Operator *****************************/
 
-void link_to_scene(Main *UNUSED(bmain), unsigned short UNUSED(nr))
+static void link_to_scene(Main *UNUSED(bmain), unsigned short UNUSED(nr))
 {
 #if 0
 	Scene *sce= (Scene*) BLI_findlink(&bmain->scene, G.curscreen->scenenr-1);
@@ -1366,7 +1366,7 @@ static void single_object_users__forwardModifierLinks(void *UNUSED(userData), Ob
 	ID_NEW(*obpoin);
 }
 
-void single_object_users(Scene *scene, View3D *v3d, int flag)	
+static void single_object_users(Scene *scene, View3D *v3d, int flag)	
 {
 	Base *base;
 	Object *ob, *obn;
@@ -1415,7 +1415,7 @@ void single_object_users(Scene *scene, View3D *v3d, int flag)
 	set_sca_new_poins();
 }
 
-void new_id_matar(Material **matar, int totcol)
+static void new_id_matar(Material **matar, int totcol)
 {
 	ID *id;
 	int a;
@@ -1437,7 +1437,7 @@ void new_id_matar(Material **matar, int totcol)
 	}
 }
 
-void single_obdata_users(Main *bmain, Scene *scene, int flag)
+static void single_obdata_users(Main *bmain, Scene *scene, int flag)
 {
 	Object *ob;
 	Lamp *la;
@@ -1571,7 +1571,7 @@ static void single_mat_users(Scene *scene, int flag, int do_textures)
 	}
 }
 
-void do_single_tex_user(Tex **from)
+static void do_single_tex_user(Tex **from)
 {
 	Tex *tex, *texn;
 	
@@ -1592,7 +1592,7 @@ void do_single_tex_user(Tex **from)
 	}
 }
 
-void single_tex_users_expand(Main *bmain)
+static void single_tex_users_expand(Main *bmain)
 {
 	/* only when 'parent' blocks are LIB_NEW */
 	Material *ma;
diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c
index 3cb20ebbac0..5853a230719 100644
--- a/source/blender/editors/object/object_select.c
+++ b/source/blender/editors/object/object_select.c
@@ -58,6 +58,7 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "ED_object.h"
 #include "ED_screen.h"
 
 #include "UI_interface.h"
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c
index 355f1c153cf..cf5a5acf6ed 100644
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@ -650,7 +650,7 @@ void OBJECT_OT_rotation_apply(wmOperatorType *ot)
 
 /************************ Texture Space Transform ****************************/
 
-void texspace_edit(Scene *scene, View3D *v3d)
+static void texspace_edit(Scene *scene, View3D *v3d)
 {
 	Base *base;
 	int nr=0;
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index c673ea0fd2d..ab52d527561 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -150,7 +150,7 @@ void ED_vgroup_data_create(ID *id)
 	}
 }
 
-int ED_vgroup_give_parray(ID *id, MDeformVert ***dvert_arr, int *dvert_tot)
+static int ED_vgroup_give_parray(ID *id, MDeformVert ***dvert_arr, int *dvert_tot)
 {
 	if(id) {
 		switch(GS(id->name)) {
@@ -304,7 +304,7 @@ int ED_vgroup_copy_array(Object *ob, Object *ob_from)
 
 /* for mesh in object mode
    lattice can be in editmode */
-void ED_vgroup_nr_vert_remove(Object *ob, int def_nr, int vertnum)
+static void ED_vgroup_nr_vert_remove(Object *ob, int def_nr, int vertnum)
 {
 	/* This routine removes the vertex from the deform
 	 * group with number def_nr.
@@ -372,7 +372,7 @@ void ED_vgroup_nr_vert_remove(Object *ob, int def_nr, int vertnum)
 
 /* for Mesh in Object mode */
 /* allows editmode for Lattice */
-void ED_vgroup_nr_vert_add(Object *ob, int def_nr, int vertnum, float weight, int assignmode)
+static void ED_vgroup_nr_vert_add(Object *ob, int def_nr, int vertnum, float weight, int assignmode)
 {
 	/* add the vert to the deform group with the
 	 * specified number