[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36596] trunk/blender/source/blender: remove some duplicate declarations
Campbell Barton
ideasman42 at gmail.com
Tue May 10 16:48:07 CEST 2011
Revision: 36596
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36596
Author: campbellbarton
Date: 2011-05-10 14:48:06 +0000 (Tue, 10 May 2011)
Log Message:
-----------
remove some duplicate declarations
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenlib/intern/rand.c
trunk/blender/source/blender/editors/include/ED_util.h
trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
trunk/blender/source/blender/editors/util/util_intern.h
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/python/generic/IDProp.c
trunk/blender/source/blender/python/intern/bpy_operator.c
trunk/blender/source/blender/python/intern/bpy_rna.h
Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c 2011-05-10 14:38:55 UTC (rev 36595)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c 2011-05-10 14:48:06 UTC (rev 36596)
@@ -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 @@
}
for (i=0; i<totface; i++) {
- extern Material defmaterial; /* material.c */
MFace *mf= &mface[i];
Material *ma= give_current_material(ob, mf->mat_nr+1);
int j, vidx[4], nverts= mf->v4?4:3;
@@ -664,8 +665,6 @@
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 @@
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");
Modified: trunk/blender/source/blender/blenlib/intern/rand.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/rand.c 2011-05-10 14:38:55 UTC (rev 36595)
+++ trunk/blender/source/blender/blenlib/intern/rand.c 2011-05-10 14:48:06 UTC (rev 36596)
@@ -58,6 +58,8 @@
#define LOWSEED 0x330E
+extern unsigned char hash[]; // noise.c
+
/***/
struct RNG {
@@ -83,8 +85,6 @@
}
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 @@
void BLI_thread_srandom(int thread, unsigned int seed)
{
- extern unsigned char hash[]; // noise.c
-
if(thread >= BLENDER_MAX_THREADS)
thread= 0;
Modified: trunk/blender/source/blender/editors/include/ED_util.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_util.h 2011-05-10 14:38:55 UTC (rev 36595)
+++ trunk/blender/source/blender/editors/include/ED_util.h 2011-05-10 14:48:06 UTC (rev 36596)
@@ -86,7 +86,6 @@
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]);
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_snap.c 2011-05-10 14:38:55 UTC (rev 36595)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_snap.c 2011-05-10 14:48:06 UTC (rev 36596)
@@ -70,6 +70,7 @@
#include "view3d_intern.h"
+extern float originmat[3][3]; /* XXX object.c */
/* ************************************************** */
/* ********************* old transform stuff ******** */
@@ -451,7 +452,6 @@
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 @@
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);
Modified: trunk/blender/source/blender/editors/util/util_intern.h
===================================================================
--- trunk/blender/source/blender/editors/util/util_intern.h 2011-05-10 14:38:55 UTC (rev 36595)
+++ trunk/blender/source/blender/editors/util/util_intern.h 2011-05-10 14:48:06 UTC (rev 36596)
@@ -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);
Modified: trunk/blender/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_draw.c 2011-05-10 14:38:55 UTC (rev 36595)
+++ trunk/blender/source/blender/gpu/intern/gpu_draw.c 2011-05-10 14:48:06 UTC (rev 36596)
@@ -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 @@
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 @@
int GPU_enable_material(int nr, void *attribs)
{
- extern Material defmaterial; /* from material.c */
GPUVertexAttribs *gattribs = attribs;
GPUMaterial *gpumat;
GPUBlendMode blendmode;
Modified: trunk/blender/source/blender/python/generic/IDProp.c
===================================================================
--- trunk/blender/source/blender/python/generic/IDProp.c 2011-05-10 14:38:55 UTC (rev 36595)
+++ trunk/blender/source/blender/python/generic/IDProp.c 2011-05-10 14:48:06 UTC (rev 36596)
@@ -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;
Modified: trunk/blender/source/blender/python/intern/bpy_operator.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_operator.c 2011-05-10 14:38:55 UTC (rev 36595)
+++ trunk/blender/source/blender/python/intern/bpy_operator.c 2011-05-10 14:48:06 UTC (rev 36596)
@@ -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() */
Modified: trunk/blender/source/blender/python/intern/bpy_rna.h
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.h 2011-05-10 14:38:55 UTC (rev 36595)
+++ trunk/blender/source/blender/python/intern/bpy_rna.h 2011-05-10 14:48:06 UTC (rev 36596)
@@ -187,12 +187,8 @@
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
More information about the Bf-blender-cvs
mailing list