[Bf-blender-cvs] [f63b839] soc-2013-paint: Code Cleanup: use const

Campbell Barton noreply at git.blender.org
Sat Jul 12 12:45:09 CEST 2014


Commit: f63b839357b04d6e8813b03e1abb5ac762f5389f
Author: Campbell Barton
Date:   Sat Jul 12 09:07:51 2014 +1000
https://developer.blender.org/rBf63b839357b04d6e8813b03e1abb5ac762f5389f

Code Cleanup: use const

===================================================================

M	source/blender/blenkernel/intern/DerivedMesh.c
M	source/blender/blenkernel/intern/mask_rasterize.c
M	source/blender/blenkernel/intern/multires.c
M	source/blender/blenkernel/intern/tracking_region_tracker.c
M	source/blender/blenkernel/intern/tracking_stabilize.c
M	source/blender/blenkernel/intern/unit.c
M	source/blender/bmesh/intern/bmesh_interp.c

===================================================================

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 63724c4..6bdf80e 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1134,7 +1134,7 @@ static void weightpaint_color(unsigned char r_col[4], DMWeightColorInfo *dm_wcin
 
 static void calc_weightpaint_vert_color(
         unsigned char r_col[4],
-        MDeformVert *dv, 
+        const MDeformVert *dv,
         DMWeightColorInfo *dm_wcinfo,
         const int defbase_tot, const int defbase_act,
         const bool *defbase_sel, const int defbase_sel_tot,
@@ -1149,7 +1149,7 @@ static void calc_weightpaint_vert_color(
 		bool was_a_nonzero = false;
 		unsigned int i;
 
-		MDeformWeight *dw = dv->dw;
+		const MDeformWeight *dw = dv->dw;
 		for (i = dv->totweight; i != 0; i--, dw++) {
 			/* in multipaint, get the average if auto normalize is inactive
 			 * get the sum if it is active */
diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c
index 3520759..4dc8ed2 100644
--- a/source/blender/blenkernel/intern/mask_rasterize.c
+++ b/source/blender/blenkernel/intern/mask_rasterize.c
@@ -326,7 +326,7 @@ static void maskrasterize_spline_differentiate_point_outset(float (*diff_feather
  *   are to any of the triangle edges.
  */
 static bool layer_bucket_isect_test(
-        MaskRasterLayer *layer, unsigned int face_index,
+        const MaskRasterLayer *layer, unsigned int face_index,
         const unsigned int bucket_x, const unsigned int bucket_y,
         const float bucket_size_x, const float bucket_size_y,
         const float bucket_max_rad_squared)
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index 1d5bbbe..246ef8a 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -112,7 +112,7 @@ static BLI_bitmap *multires_mdisps_upsample_hidden(BLI_bitmap *lo_hidden,
 
                                                    /* assumed to be at hi_level (or
                                                     *  null) */
-                                                   BLI_bitmap *prev_hidden)
+                                                   const BLI_bitmap *prev_hidden)
 {
 	BLI_bitmap *subd;
 	int hi_gridsize = BKE_ccg_gridsize(hi_level);
diff --git a/source/blender/blenkernel/intern/tracking_region_tracker.c b/source/blender/blenkernel/intern/tracking_region_tracker.c
index 76b7ad5..6300e29 100644
--- a/source/blender/blenkernel/intern/tracking_region_tracker.c
+++ b/source/blender/blenkernel/intern/tracking_region_tracker.c
@@ -501,7 +501,7 @@ static void tracking_scale_marker_search(const MovieTrackingMarker *old_marker,
 static void tracking_insert_new_marker(MovieTrackingContext *context, MovieTrackingTrack *track,
                                        const MovieTrackingMarker *old_marker, int curfra, bool tracked,
                                        int frame_width, int frame_height,
-                                       double dst_pixel_x[5], double dst_pixel_y[5])
+                                       const double dst_pixel_x[5], const double dst_pixel_y[5])
 {
 	MovieTrackingMarker new_marker;
 	int frame_delta = context->backwards ? -1 : 1;
diff --git a/source/blender/blenkernel/intern/tracking_stabilize.c b/source/blender/blenkernel/intern/tracking_stabilize.c
index ffbdf5c..9ede39f 100644
--- a/source/blender/blenkernel/intern/tracking_stabilize.c
+++ b/source/blender/blenkernel/intern/tracking_stabilize.c
@@ -82,7 +82,7 @@ static bool stabilization_median_point_get(MovieTracking *tracking, int framenr,
  * NOTE: frame number should be in clip space, not scene space
  */
 static void stabilization_calculate_data(MovieTracking *tracking, int framenr, int width, int height,
-                                         float firstmedian[2], float median[2],
+                                         const float firstmedian[2], const float median[2],
                                          float translation[2], float *scale, float *angle)
 {
 	MovieTrackingStabilization *stab = &tracking->stabilization;
diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c
index 8aca9f7..f7024de 100644
--- a/source/blender/blenkernel/intern/unit.c
+++ b/source/blender/blenkernel/intern/unit.c
@@ -349,7 +349,7 @@ static void unit_dual_convert(double value, bUnitCollection *usys, bUnitDef **un
 
 static size_t unit_as_string(char *str, int len_max, double value, int prec, bUnitCollection *usys,
                              /* non exposed options */
-                             bUnitDef *unit, char pad)
+                             const bUnitDef *unit, char pad)
 {
 	double value_conv;
 	size_t len, i;
diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c
index 2250b81..306b6e7 100644
--- a/source/blender/bmesh/intern/bmesh_interp.c
+++ b/source/blender/bmesh/intern/bmesh_interp.c
@@ -397,8 +397,8 @@ static float bm_loop_flip_equotion(float mat[2][2], float b[2], const float targ
 	return mat[0][0] * mat[1][1] - mat[0][1] * mat[1][0];
 }
 
-static void bm_loop_flip_disp(float source_axis_x[3], float source_axis_y[3],
-                                 float target_axis_x[3], float target_axis_y[3], float disp[3])
+static void bm_loop_flip_disp(const float source_axis_x[3], const float source_axis_y[3],
+                              const float target_axis_x[3], const float target_axis_y[3], float disp[3])
 {
 	float vx[3], vy[3], coord[3];
 	float n[3], vec[3];




More information about the Bf-blender-cvs mailing list