[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60696] trunk/blender: code cleanup: use const's for vector args.

Campbell Barton ideasman42 at gmail.com
Sat Oct 12 04:19:40 CEST 2013


Revision: 60696
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60696
Author:   campbellbarton
Date:     2013-10-12 02:19:37 +0000 (Sat, 12 Oct 2013)
Log Message:
-----------
code cleanup: use const's for vector args.

Modified Paths:
--------------
    trunk/blender/build_files/cmake/macros.cmake
    trunk/blender/source/blender/blenkernel/intern/anim.c
    trunk/blender/source/blender/blenlib/intern/noise.c
    trunk/blender/source/blender/editors/mesh/editmesh_extrude.c
    trunk/blender/source/blender/editors/space_view3d/drawobject.c
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
    trunk/blender/source/blender/imbuf/intern/tiff.c
    trunk/blender/source/blender/python/mathutils/mathutils_Euler.c
    trunk/blender/source/blender/python/mathutils/mathutils_Euler.h
    trunk/blender/source/blender/python/mathutils/mathutils_Quaternion.c
    trunk/blender/source/blender/python/mathutils/mathutils_Quaternion.h
    trunk/blender/source/blender/python/mathutils/mathutils_Vector.c
    trunk/blender/source/blender/python/mathutils/mathutils_Vector.h
    trunk/blender/source/blender/render/extern/include/RE_pipeline.h
    trunk/blender/source/blender/render/intern/source/convertblender.c

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake	2013-10-12 00:08:34 UTC (rev 60695)
+++ trunk/blender/build_files/cmake/macros.cmake	2013-10-12 02:19:37 UTC (rev 60696)
@@ -585,7 +585,8 @@
 
 macro(get_blender_version)
 	# 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_.*$")
 

Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c	2013-10-12 00:08:34 UTC (rev 60695)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c	2013-10-12 02:19:37 UTC (rev 60696)
@@ -530,7 +530,7 @@
 		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 */
 	bevp = bevpfirst = (BevPoint *)(bl + 1);

Modified: trunk/blender/source/blender/blenlib/intern/noise.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/noise.c	2013-10-12 00:08:34 UTC (rev 60695)
+++ trunk/blender/source/blender/blenlib/intern/noise.c	2013-10-12 02:19:37 UTC (rev 60696)
@@ -42,7 +42,7 @@
 
 /* local */
 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);
 
 /* UNUSED */
@@ -1097,7 +1097,7 @@
 }
 
 #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];
 

Modified: trunk/blender/source/blender/editors/mesh/editmesh_extrude.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_extrude.c	2013-10-12 00:08:34 UTC (rev 60695)
+++ trunk/blender/source/blender/editors/mesh/editmesh_extrude.c	2013-10-12 02:19:37 UTC (rev 60696)
@@ -290,7 +290,7 @@
 		//BMO_op_callf(em->bm, BMO_FLAG_DEFAULTS, "extrude_face_region geom=%hef", BM_ELEM_SELECT);
 		BMO_op_callf(em->bm, BMO_FLAG_DEFAULTS,
 		             "translate vec=%v verts=%hv",
-		             (float *)dvec, BM_ELEM_SELECT);
+		             dvec, BM_ELEM_SELECT);
 		//extrudeflag(obedit, em, SELECT, nor);
 		//translateflag(em, SELECT, dvec);
 	}

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2013-10-12 00:08:34 UTC (rev 60695)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2013-10-12 02:19:37 UTC (rev 60696)
@@ -2043,7 +2043,7 @@
 
 	if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
 		if (!data->uniform_scale) {
-			mul_v3_m3v3(n, data->tmat, (float *) no);
+			mul_v3_m3v3(n, data->tmat, no);
 			normalize_v3(n);
 			mul_m3_v3(data->imat, n);
 		}
@@ -2108,7 +2108,7 @@
 		}
 
 		if (!data->uniform_scale) {
-			mul_v3_m3v3(n, data->tmat, (float *) no);
+			mul_v3_m3v3(n, data->tmat, no);
 			normalize_v3(n);
 			mul_m3_v3(data->imat, n);
 		}

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2013-10-12 00:08:34 UTC (rev 60695)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2013-10-12 02:19:37 UTC (rev 60696)
@@ -113,9 +113,9 @@
 	glPointSize(1.0);
 	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)
 {

Modified: trunk/blender/source/blender/imbuf/intern/tiff.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/tiff.c	2013-10-12 00:08:34 UTC (rev 60695)
+++ trunk/blender/source/blender/imbuf/intern/tiff.c	2013-10-12 02:19:37 UTC (rev 60696)
@@ -315,7 +315,7 @@
 	         (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;
 	for (i = 0; i < scanline_w; i++) {
@@ -326,7 +326,7 @@
 	}
 }
 
-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;
 	for (i = 0; i < scanline_w; i++) {
@@ -337,14 +337,14 @@
 	}
 }
 
-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;
 	for (i = 0; i < scanline_w; i++)
 		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;
 	for (i = 0; i < scanline_w; i++)

Modified: trunk/blender/source/blender/python/mathutils/mathutils_Euler.c
===================================================================
--- trunk/blender/source/blender/python/mathutils/mathutils_Euler.c	2013-10-12 00:08:34 UTC (rev 60695)
+++ trunk/blender/source/blender/python/mathutils/mathutils_Euler.c	2013-10-12 02:19:37 UTC (rev 60696)
@@ -707,7 +707,7 @@
  * (i.e. it was allocated elsewhere by MEM_mallocN())
  * pass Py_NEW - if vector is not a WRAPPER and managed by PYTHON
  * (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;
 

Modified: trunk/blender/source/blender/python/mathutils/mathutils_Euler.h
===================================================================
--- trunk/blender/source/blender/python/mathutils/mathutils_Euler.h	2013-10-12 00:08:34 UTC (rev 60695)
+++ trunk/blender/source/blender/python/mathutils/mathutils_Euler.h	2013-10-12 02:19:37 UTC (rev 60696)
@@ -43,7 +43,7 @@
  * blender (stored in blend_data). This is an either/or struct not both */
 
 /* 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,
                                   unsigned char cb_type, unsigned char cb_subtype);
 

Modified: trunk/blender/source/blender/python/mathutils/mathutils_Quaternion.c
===================================================================
--- trunk/blender/source/blender/python/mathutils/mathutils_Quaternion.c	2013-10-12 00:08:34 UTC (rev 60695)
+++ trunk/blender/source/blender/python/mathutils/mathutils_Quaternion.c	2013-10-12 02:19:37 UTC (rev 60696)
@@ -1246,7 +1246,7 @@
  * (i.e. it was allocated elsewhere by MEM_mallocN())
  *  pass Py_NEW - if vector is not a WRAPPER and managed by PYTHON
  * (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;
 

Modified: trunk/blender/source/blender/python/mathutils/mathutils_Quaternion.h
===================================================================
--- trunk/blender/source/blender/python/mathutils/mathutils_Quaternion.h	2013-10-12 00:08:34 UTC (rev 60695)
+++ trunk/blender/source/blender/python/mathutils/mathutils_Quaternion.h	2013-10-12 02:19:37 UTC (rev 60696)
@@ -40,7 +40,7 @@
  * blender (stored in blend_data). This is an either/or struct not both */
 
 /* 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,
                                        unsigned char cb_type, unsigned char cb_subtype);
 

Modified: trunk/blender/source/blender/python/mathutils/mathutils_Vector.c
===================================================================
--- trunk/blender/source/blender/python/mathutils/mathutils_Vector.c	2013-10-12 00:08:34 UTC (rev 60695)
+++ trunk/blender/source/blender/python/mathutils/mathutils_Vector.c	2013-10-12 02:19:37 UTC (rev 60696)
@@ -1853,7 +1853,7 @@
 }
 
 /*------------------------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);*/
 	/* warning, line above removed because we are not using the length,
@@ -2940,10 +2940,10 @@
 	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;
-	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;
 
 	return (PyObject *)vect_ob;

Modified: trunk/blender/source/blender/python/mathutils/mathutils_Vector.h
===================================================================

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list