From 89a166d0deb5587ff89bf4d07f8533bf55fc5d8f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 10 May 2011 14:48:06 +0000 Subject: remove some duplicate declarations --- source/blender/blenkernel/intern/displist.c | 7 ++----- source/blender/blenlib/intern/rand.c | 6 ++---- source/blender/editors/include/ED_util.h | 1 - source/blender/editors/space_view3d/view3d_snap.c | 3 +-- source/blender/editors/util/util_intern.h | 1 - source/blender/gpu/intern/gpu_draw.c | 4 ++-- source/blender/python/generic/IDProp.c | 6 ------ source/blender/python/intern/bpy_operator.c | 1 + source/blender/python/intern/bpy_rna.h | 4 ---- 9 files changed, 8 insertions(+), 25 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 29b9fd5eab7..a8351e0bb1b 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -72,6 +72,8 @@ #include "ED_curve.h" /* for BKE_curve_nurbs */ +extern Material defmaterial; /* material.c */ + static void boundbox_displist(Object *ob); void free_disp_elem(DispList *dl) @@ -552,7 +554,6 @@ static void mesh_create_shadedColors(Render *re, Object *ob, int onlyForMesh, un } for (i=0; imat_nr+1); int j, vidx[4], nverts= mf->v4?4:3; @@ -664,8 +665,6 @@ void shadeDispList(Scene *scene, Base *base) dl= ob->disp.first; while(dl) { - extern Material defmaterial; /* material.c */ - dlob= MEM_callocN(sizeof(DispList), "displistshade"); BLI_addtail(&ob->disp, dlob); dlob->type= DL_VERTCOL; @@ -734,8 +733,6 @@ void shadeDispList(Scene *scene, Base *base) if(dl->type==DL_INDEX4) { if(dl->nors) { - extern Material defmaterial; /* material.c */ - if(dl->col1) MEM_freeN(dl->col1); col1= dl->col1= MEM_mallocN(sizeof(int)*dl->nr, "col1"); diff --git a/source/blender/blenlib/intern/rand.c b/source/blender/blenlib/intern/rand.c index d889c1b9bf2..9bd540e46ea 100644 --- a/source/blender/blenlib/intern/rand.c +++ b/source/blender/blenlib/intern/rand.c @@ -58,6 +58,8 @@ typedef unsigned long long r_uint64; #define LOWSEED 0x330E +extern unsigned char hash[]; // noise.c + /***/ struct RNG { @@ -83,8 +85,6 @@ void rng_seed(RNG *rng, unsigned int seed) { } void rng_srandom(RNG *rng, unsigned int seed) { - extern unsigned char hash[]; // noise.c - rng_seed(rng, seed + hash[seed & 255]); seed= rng_getInt(rng); rng_seed(rng, seed + hash[seed & 255]); @@ -180,8 +180,6 @@ static RNG rng_tab[BLENDER_MAX_THREADS]; void BLI_thread_srandom(int thread, unsigned int seed) { - extern unsigned char hash[]; // noise.c - if(thread >= BLENDER_MAX_THREADS) thread= 0; diff --git a/source/blender/editors/include/ED_util.h b/source/blender/editors/include/ED_util.h index 77b754519fb..50dd2308b6b 100644 --- a/source/blender/editors/include/ED_util.h +++ b/source/blender/editors/include/ED_util.h @@ -86,7 +86,6 @@ void undo_editmode_step (struct bContext *C, int step); float *crazyspace_get_mapped_editverts(struct Scene *scene, struct Object *obedit); void crazyspace_set_quats_editmesh(struct EditMesh *em, float *origcos, float *mappedcos, float *quats); void crazyspace_set_quats_mesh(struct Mesh *me, float *origcos, float *mappedcos, float *quats); -int editmesh_get_first_deform_matrices(struct Scene *scene, struct Object *ob, struct EditMesh *em, float (**deformmats)[3][3], float (**deformcos)[3]); int sculpt_get_first_deform_matrices(struct Scene *scene, struct Object *ob, float (**deformmats)[3][3], float (**deformcos)[3]); void crazyspace_build_sculpt(struct Scene *scene, struct Object *ob, float (**deformmats)[3][3], float (**deformcos)[3]); diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index a3d42aa5579..b4d2fc22143 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -70,6 +70,7 @@ #include "view3d_intern.h" +extern float originmat[3][3]; /* XXX object.c */ /* ************************************************** */ /* ********************* old transform stuff ******** */ @@ -451,7 +452,6 @@ static void make_trans_verts(Object *obedit, float *min, float *max, int mode) static int snap_sel_to_grid(bContext *C, wmOperator *UNUSED(op)) { - extern float originmat[3][3]; /* XXX object.c */ Main *bmain= CTX_data_main(C); Object *obedit= CTX_data_edit_object(C); Scene *scene= CTX_data_scene(C); @@ -588,7 +588,6 @@ void VIEW3D_OT_snap_selected_to_grid(wmOperatorType *ot) static int snap_sel_to_curs(bContext *C, wmOperator *UNUSED(op)) { - extern float originmat[3][3]; /* XXX object.c */ Main *bmain= CTX_data_main(C); Object *obedit= CTX_data_edit_object(C); Scene *scene= CTX_data_scene(C); diff --git a/source/blender/editors/util/util_intern.h b/source/blender/editors/util/util_intern.h index 9ecfb07d535..1a82668236d 100644 --- a/source/blender/editors/util/util_intern.h +++ b/source/blender/editors/util/util_intern.h @@ -37,7 +37,6 @@ /* internal exports only */ /* editmode_undo.c */ -void undo_editmode_clear(void); void undo_editmode_name(bContext *C, const char *undoname); int undo_editmode_valid(const char *undoname); diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 25be2e2aeb4..0e7df43bd34 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -76,6 +76,8 @@ #include "smoke_API.h" +extern Material defmaterial; /* from material.c */ + /* These are some obscure rendering functions shared between the * game engine and the blender, in this module to avoid duplicaten * and abstract them away from the rest a bit */ @@ -951,7 +953,6 @@ static Material *gpu_active_node_material(Material *ma) void GPU_begin_object_materials(View3D *v3d, RegionView3D *rv3d, Scene *scene, Object *ob, int glsl, int *do_alpha_pass) { - extern Material defmaterial; /* from material.c */ Material *ma; GPUMaterial *gpumat; GPUBlendMode blendmode; @@ -1042,7 +1043,6 @@ void GPU_begin_object_materials(View3D *v3d, RegionView3D *rv3d, Scene *scene, O int GPU_enable_material(int nr, void *attribs) { - extern Material defmaterial; /* from material.c */ GPUVertexAttribs *gattribs = attribs; GPUMaterial *gpumat; GPUBlendMode blendmode; diff --git a/source/blender/python/generic/IDProp.c b/source/blender/python/generic/IDProp.c index ccf498f1550..8330927d920 100644 --- a/source/blender/python/generic/IDProp.c +++ b/source/blender/python/generic/IDProp.c @@ -45,12 +45,6 @@ #include "py_capi_utils.h" #endif -PyObject * PyC_UnicodeFromByte(const char *str); -const char * PyC_UnicodeAsByte(PyObject *py_str, PyObject **coerce); /* coerce must be NULL */ - -/*** Function to wrap ID properties ***/ -PyObject *BPy_Wrap_IDProperty(ID *id, IDProperty *prop, IDProperty *parent); - extern PyTypeObject IDArray_Type; extern PyTypeObject IDGroup_Iter_Type; diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c index c230e952ca1..b8883e655f2 100644 --- a/source/blender/python/intern/bpy_operator.c +++ b/source/blender/python/intern/bpy_operator.c @@ -36,6 +36,7 @@ #include "RNA_types.h" +#include "BPY_extern.h" #include "bpy_operator.h" #include "bpy_operator_wrap.h" #include "bpy_rna.h" /* for setting arg props only - pyrna_py_to_prop() */ diff --git a/source/blender/python/intern/bpy_rna.h b/source/blender/python/intern/bpy_rna.h index ba19f155842..28459677b32 100644 --- a/source/blender/python/intern/bpy_rna.h +++ b/source/blender/python/intern/bpy_rna.h @@ -187,12 +187,8 @@ int pyrna_write_check(void); int pyrna_struct_validity_check(BPy_StructRNA *pysrna); int pyrna_prop_validity_check(BPy_PropertyRNA *self); -void BPY_modules_update(struct bContext *C); //XXX temp solution - /* bpy.utils.(un)register_class */ extern PyMethodDef meth_bpy_register_class; extern PyMethodDef meth_bpy_unregister_class; -void BPY_id_release(struct ID *id); - #endif -- cgit v1.2.3