sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

code cleanup: use const's for vector args.

Browse Source
This commit is contained in:
Campbell Barton 2013-10-12 02:19:37 +00:00
parent 744f691af4
commit b6db417ee4
15 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build_files/cmake/macros.cmake
View File

@ -585,7 +585,8 @@ endmacro()
macro(get_blender_version) macro(get_blender_version)
# So cmake depends on BKE_blender.h, beware of inf-loops! # So cmake depends on BKE_blender.h, beware of inf-loops!
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h ${CMAKE_BINARY_DIR}/source/blender/blenkernel/BKE_blender.h.done) CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h
${CMAKE_BINARY_DIR}/source/blender/blenkernel/BKE_blender.h.done)
file(STRINGS ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h _contents REGEX "^#define[ \t]+BLENDER_.*$") file(STRINGS ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h _contents REGEX "^#define[ \t]+BLENDER_.*$")

2
source/blender/blenkernel/intern/anim.c
View File

@ -530,7 +530,7 @@ void calc_curvepath(Object *ob, ListBase *nurbs)
path->len = nu->resolu * SEGMENTSU(nu); path->len = nu->resolu * SEGMENTSU(nu);
} }
dist = (float *)MEM_mallocN((tot + 1) * 4, "calcpathdist"); dist = (float *)MEM_mallocN(sizeof(float) * (tot + 1), "calcpathdist");
/* all lengths in *dist */ /* all lengths in *dist */
bevp = bevpfirst = (BevPoint *)(bl + 1); bevp = bevpfirst = (BevPoint *)(bl + 1);

4
source/blender/blenlib/intern/noise.c
View File

@ -42,7 +42,7 @@
/* local */ /* local */
static float noise3_perlin(float vec[3]); static float noise3_perlin(float vec[3]);
//static float turbulence_perlin(float *point, float lofreq, float hifreq); //static float turbulence_perlin(const float point[3], float lofreq, float hifreq);
//static float turbulencep(float noisesize, float x, float y, float z, int nr); //static float turbulencep(float noisesize, float x, float y, float z, int nr);
/* UNUSED */ /* UNUSED */
@ -1097,7 +1097,7 @@ static float noise3_perlin(float vec[3])
} }
#if 0 #if 0
static float turbulence_perlin(float *point, float lofreq, float hifreq) static float turbulence_perlin(const float point[3], float lofreq, float hifreq)
{ {
float freq, t, p[3]; float freq, t, p[3];

2
source/blender/editors/mesh/editmesh_extrude.c
View File

@ -290,7 +290,7 @@ static int edbm_extrude_repeat_exec(bContext *C, wmOperator *op)
//BMO_op_callf(em->bm, BMO_FLAG_DEFAULTS, "extrude_face_region geom=%hef", BM_ELEM_SELECT); //BMO_op_callf(em->bm, BMO_FLAG_DEFAULTS, "extrude_face_region geom=%hef", BM_ELEM_SELECT);
BMO_op_callf(em->bm, BMO_FLAG_DEFAULTS, BMO_op_callf(em->bm, BMO_FLAG_DEFAULTS,
"translate vec=%v verts=%hv", "translate vec=%v verts=%hv",
(float *)dvec, BM_ELEM_SELECT); dvec, BM_ELEM_SELECT);
//extrudeflag(obedit, em, SELECT, nor); //extrudeflag(obedit, em, SELECT, nor);
//translateflag(em, SELECT, dvec); //translateflag(em, SELECT, dvec);
} }

4
source/blender/editors/space_view3d/drawobject.c
View File

@ -2043,7 +2043,7 @@ static void draw_dm_face_normals__mapFunc(void *userData, int index, const float
if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
if (!data->uniform_scale) { if (!data->uniform_scale) {
mul_v3_m3v3(n, data->tmat, (float *) no); mul_v3_m3v3(n, data->tmat, no);
normalize_v3(n); normalize_v3(n);
mul_m3_v3(data->imat, n); mul_m3_v3(data->imat, n);
} }
@ -2108,7 +2108,7 @@ static void draw_dm_vert_normals__mapFunc(void *userData, int index, const float
} }
if (!data->uniform_scale) { if (!data->uniform_scale) {
mul_v3_m3v3(n, data->tmat, (float *) no); mul_v3_m3v3(n, data->tmat, no);
normalize_v3(n); normalize_v3(n);
mul_m3_v3(data->imat, n); mul_m3_v3(data->imat, n);
} }

4
source/blender/editors/space_view3d/view3d_draw.c
View File

@ -113,9 +113,9 @@ static void star_stuff_init_func(void)
glPointSize(1.0); glPointSize(1.0);
glBegin(GL_POINTS); glBegin(GL_POINTS);
} }
static void star_stuff_vertex_func(float *i) static void star_stuff_vertex_func(const float vec[3])
{ {
glVertex3fv(i); glVertex3fv(vec);
} }
static void star_stuff_term_func(void) static void star_stuff_term_func(void)
{ {

8
source/blender/imbuf/intern/tiff.c
View File

@ -315,7 +315,7 @@ int imb_is_a_tiff(unsigned char *mem)
(memcmp(lil_endian, mem, IMB_TIFF_NCB) == 0) ); (memcmp(lil_endian, mem, IMB_TIFF_NCB) == 0) );
} }
static void scanline_contig_16bit(float *rectf, unsigned short *sbuf, int scanline_w, int spp) static void scanline_contig_16bit(float *rectf, const unsigned short *sbuf, int scanline_w, int spp)
{ {
int i; int i;
for (i = 0; i < scanline_w; i++) { for (i = 0; i < scanline_w; i++) {
@ -326,7 +326,7 @@ static void scanline_contig_16bit(float *rectf, unsigned short *sbuf, int scanli
} }
} }
static void scanline_contig_32bit(float *rectf, float *fbuf, int scanline_w, int spp) static void scanline_contig_32bit(float *rectf, const float *fbuf, int scanline_w, int spp)
{ {
int i; int i;
for (i = 0; i < scanline_w; i++) { for (i = 0; i < scanline_w; i++) {
@ -337,14 +337,14 @@ static void scanline_contig_32bit(float *rectf, float *fbuf, int scanline_w, int
} }
} }
static void scanline_separate_16bit(float *rectf, unsigned short *sbuf, int scanline_w, int chan) static void scanline_separate_16bit(float *rectf, const unsigned short *sbuf, int scanline_w, int chan)
{ {
int i; int i;
for (i = 0; i < scanline_w; i++) for (i = 0; i < scanline_w; i++)
rectf[i * 4 + chan] = sbuf[i] / 65535.0; rectf[i * 4 + chan] = sbuf[i] / 65535.0;
} }
static void scanline_separate_32bit(float *rectf, float *fbuf, int scanline_w, int chan) static void scanline_separate_32bit(float *rectf, const float *fbuf, int scanline_w, int chan)
{ {
int i; int i;
for (i = 0; i < scanline_w; i++) for (i = 0; i < scanline_w; i++)

2
source/blender/python/mathutils/mathutils_Euler.c
View File

@ -707,7 +707,7 @@ PyTypeObject euler_Type = {
* (i.e. it was allocated elsewhere by MEM_mallocN()) * (i.e. it was allocated elsewhere by MEM_mallocN())
* pass Py_NEW - if vector is not a WRAPPER and managed by PYTHON * pass Py_NEW - if vector is not a WRAPPER and managed by PYTHON
* (i.e. it must be created here with PyMEM_malloc())*/ * (i.e. it must be created here with PyMEM_malloc())*/
PyObject *Euler_CreatePyObject(float *eul, const short order, int type, PyTypeObject *base_type) PyObject *Euler_CreatePyObject(float eul[3], const short order, int type, PyTypeObject *base_type)
{ {
EulerObject *self; EulerObject *self;

2
source/blender/python/mathutils/mathutils_Euler.h
View File

@ -43,7 +43,7 @@ typedef struct {
* blender (stored in blend_data). This is an either/or struct not both */ * blender (stored in blend_data). This is an either/or struct not both */
/* prototypes */ /* prototypes */
PyObject *Euler_CreatePyObject(float *eul, const short order, int type, PyTypeObject *base_type); PyObject *Euler_CreatePyObject(float eul[3], const short order, int type, PyTypeObject *base_type);
PyObject *Euler_CreatePyObject_cb(PyObject *cb_user, const short order, PyObject *Euler_CreatePyObject_cb(PyObject *cb_user, const short order,
unsigned char cb_type, unsigned char cb_subtype); unsigned char cb_type, unsigned char cb_subtype);

2
source/blender/python/mathutils/mathutils_Quaternion.c
View File

@ -1246,7 +1246,7 @@ PyTypeObject quaternion_Type = {
* (i.e. it was allocated elsewhere by MEM_mallocN()) * (i.e. it was allocated elsewhere by MEM_mallocN())
* pass Py_NEW - if vector is not a WRAPPER and managed by PYTHON * pass Py_NEW - if vector is not a WRAPPER and managed by PYTHON
* (i.e. it must be created here with PyMEM_malloc())*/ * (i.e. it must be created here with PyMEM_malloc())*/
PyObject *Quaternion_CreatePyObject(float *quat, int type, PyTypeObject *base_type) PyObject *Quaternion_CreatePyObject(float quat[4], int type, PyTypeObject *base_type)
{ {
QuaternionObject *self; QuaternionObject *self;

2
source/blender/python/mathutils/mathutils_Quaternion.h
View File

@ -40,7 +40,7 @@ typedef struct {
* blender (stored in blend_data). This is an either/or struct not both */ * blender (stored in blend_data). This is an either/or struct not both */
/* prototypes */ /* prototypes */
PyObject *Quaternion_CreatePyObject(float *quat, int type, PyTypeObject *base_type); PyObject *Quaternion_CreatePyObject(float quat[4], int type, PyTypeObject *base_type);
PyObject *Quaternion_CreatePyObject_cb(PyObject *cb_user, PyObject *Quaternion_CreatePyObject_cb(PyObject *cb_user,
unsigned char cb_type, unsigned char cb_subtype); unsigned char cb_type, unsigned char cb_subtype);

6
source/blender/python/mathutils/mathutils_Vector.c
View File

@ -1853,7 +1853,7 @@ static PyObject *Vector_neg(VectorObject *self)
} }
/*------------------------vec_magnitude_nosqrt (internal) - for comparing only */ /*------------------------vec_magnitude_nosqrt (internal) - for comparing only */
static double vec_magnitude_nosqrt(float *data, int size) static double vec_magnitude_nosqrt(const float *data, int size)
{ {
/* return (double)sqrt(dot);*/ /* return (double)sqrt(dot);*/
/* warning, line above removed because we are not using the length, /* warning, line above removed because we are not using the length,
@ -2940,10 +2940,10 @@ PyObject *Vector_CreatePyObject_cb(PyObject *cb_user, int size, unsigned char cb
return (PyObject *)self; return (PyObject *)self;
} }
PyObject *Vector_CreatePyObject_alloc(float *vec, const int size, PyTypeObject *base_type) PyObject *Vector_CreatePyObject_alloc(const float *vec, const int size, PyTypeObject *base_type)
{ {
VectorObject *vect_ob; VectorObject *vect_ob;
vect_ob = (VectorObject *)Vector_CreatePyObject(vec, size, Py_WRAP, base_type); vect_ob = (VectorObject *)Vector_CreatePyObject((float *)vec, size, Py_WRAP, base_type);
vect_ob->wrapped = Py_NEW; vect_ob->wrapped = Py_NEW;
return (PyObject *)vect_ob; return (PyObject *)vect_ob;

2
source/blender/python/mathutils/mathutils_Vector.h
View File

@ -41,6 +41,6 @@ typedef struct {
PyObject *Vector_CreatePyObject(float *vec, const int size, const int type, PyTypeObject *base_type); PyObject *Vector_CreatePyObject(float *vec, const int size, const int type, PyTypeObject *base_type);
PyObject *Vector_CreatePyObject_cb(PyObject *user, int size, PyObject *Vector_CreatePyObject_cb(PyObject *user, int size,
unsigned char cb_type, unsigned char subtype); unsigned char cb_type, unsigned char subtype);
PyObject *Vector_CreatePyObject_alloc(float *vec, const int size, PyTypeObject *base_type); PyObject *Vector_CreatePyObject_alloc(const float *vec, const int size, PyTypeObject *base_type);
#endif /* __MATHUTILS_VECTOR_H__ */ #endif /* __MATHUTILS_VECTOR_H__ */

2
source/blender/render/extern/include/RE_pipeline.h vendored
View File

@ -249,7 +249,7 @@ void RE_MergeFullSample(struct Render *re, struct Main *bmain, struct Scene *sce
/* ancient stars function... go away! */ /* ancient stars function... go away! */
void RE_make_stars(struct Render *re, struct Scene *scenev3d, void (*initfunc)(void), void RE_make_stars(struct Render *re, struct Scene *scenev3d, void (*initfunc)(void),
void (*vertexfunc)(float *), void (*termfunc)(void)); void (*vertexfunc)(const float *), void (*termfunc)(void));
/* display and event callbacks */ /* display and event callbacks */
void RE_display_init_cb (struct Render *re, void *handle, void (*f)(void *handle, RenderResult *rr)); void RE_display_init_cb (struct Render *re, void *handle, void (*f)(void *handle, RenderResult *rr));

2
source/blender/render/intern/source/convertblender.c
View File

@ -167,7 +167,7 @@ static HaloRen *initstar(Render *re, ObjectRen *obr, const float vec[3], float h
*/ */
void RE_make_stars(Render *re, Scene *scenev3d, void (*initfunc)(void), void RE_make_stars(Render *re, Scene *scenev3d, void (*initfunc)(void),
void (*vertexfunc)(float *), void (*termfunc)(void)) void (*vertexfunc)(const float *), void (*termfunc)(void))
{ {
extern unsigned char hash[512]; extern unsigned char hash[512];
ObjectRen *obr= NULL; ObjectRen *obr= NULL;