[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56545] trunk/blender/source/blender: code cleanup: use 'const float[2]' where possible.
Campbell Barton
ideasman42 at gmail.com
Wed May 8 14:54:34 CEST 2013
Revision: 56545
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56545
Author: campbellbarton
Date: 2013-05-08 12:54:33 +0000 (Wed, 08 May 2013)
Log Message:
-----------
code cleanup: use 'const float[2]' where possible.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/mask_evaluate.c
trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/interface/resources.c
trunk/blender/source/blender/editors/mask/mask_draw.c
trunk/blender/source/blender/editors/mask/mask_select.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/space_node/node_add.c
trunk/blender/source/blender/editors/space_node/node_draw.c
Modified: trunk/blender/source/blender/blenkernel/intern/mask_evaluate.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask_evaluate.c 2013-05-08 12:54:07 UTC (rev 56544)
+++ trunk/blender/source/blender/blenkernel/intern/mask_evaluate.c 2013-05-08 12:54:33 UTC (rev 56545)
@@ -318,7 +318,7 @@
}
}
-static int feather_bucket_index_from_coord(float co[2], const float min[2], const float bucket_scale[2],
+static int feather_bucket_index_from_coord(const float co[2], const float min[2], const float bucket_scale[2],
const int buckets_per_side)
{
int x = (int) ((co[0] - min[0]) * bucket_scale[0]);
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2013-05-08 12:54:07 UTC (rev 56544)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2013-05-08 12:54:33 UTC (rev 56545)
@@ -1260,7 +1260,7 @@
}
}
-static void gp_stroke_norm_curve_weights(Curve *cu, float minmax_weights[2])
+static void gp_stroke_norm_curve_weights(Curve *cu, const float minmax_weights[2])
{
Nurb *nu;
const float delta = minmax_weights[0];
Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_layout.c 2013-05-08 12:54:07 UTC (rev 56544)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c 2013-05-08 12:54:33 UTC (rev 56545)
@@ -2508,7 +2508,7 @@
/********************** Layout *******************/
-static void ui_item_scale(uiLayout *litem, float scale[2])
+static void ui_item_scale(uiLayout *litem, const float scale[2])
{
uiItem *item;
int x, y, w, h;
Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c 2013-05-08 12:54:07 UTC (rev 56544)
+++ trunk/blender/source/blender/editors/interface/resources.c 2013-05-08 12:54:33 UTC (rev 56545)
@@ -1053,7 +1053,6 @@
CLAMP(g, 0, 255);
b = offset + (int) cp[2];
CLAMP(b, 0, 255);
- //glColor3ub(r, g, b);
glColor4ub(r, g, b, cp[3]);
}
void UI_ThemeColorShadeAlpha(int colorid, int coloffset, int alphaoffset)
Modified: trunk/blender/source/blender/editors/mask/mask_draw.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_draw.c 2013-05-08 12:54:07 UTC (rev 56544)
+++ trunk/blender/source/blender/editors/mask/mask_draw.c 2013-05-08 12:54:33 UTC (rev 56545)
@@ -123,7 +123,7 @@
}
#endif
-static void mask_point_undistort_pos(SpaceClip *sc, float r_co[2], float co[2])
+static void mask_point_undistort_pos(SpaceClip *sc, float r_co[2], const float co[2])
{
BKE_mask_coord_to_movieclip(sc->clip, &sc->user, r_co, co);
ED_clip_point_undistorted_pos(sc, r_co, r_co);
Modified: trunk/blender/source/blender/editors/mask/mask_select.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_select.c 2013-05-08 12:54:07 UTC (rev 56544)
+++ trunk/blender/source/blender/editors/mask/mask_select.c 2013-05-08 12:54:33 UTC (rev 56545)
@@ -590,7 +590,7 @@
/********************** circle select operator *********************/
-static int mask_spline_point_inside_ellipse(BezTriple *bezt, float offset[2], float ellipse[2])
+static int mask_spline_point_inside_ellipse(BezTriple *bezt, const float offset[2], const float ellipse[2])
{
/* normalized ellipse: ell[0] = scaleX, ell[1] = scaleY */
float x, y;
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c 2013-05-08 12:54:07 UTC (rev 56544)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c 2013-05-08 12:54:33 UTC (rev 56545)
@@ -496,7 +496,7 @@
}
/* Converts a uv coord into a pixel location wrapping if the uv is outside 0-1 range */
-static void uvco_to_wrapped_pxco(float uv[2], int ibuf_x, int ibuf_y, float *x, float *y)
+static void uvco_to_wrapped_pxco(const float uv[2], int ibuf_x, int ibuf_y, float *x, float *y)
{
/* use */
*x = (float)fmodf(uv[0], 1.0f);
Modified: trunk/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_ops.c 2013-05-08 12:54:07 UTC (rev 56544)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c 2013-05-08 12:54:33 UTC (rev 56545)
@@ -87,7 +87,7 @@
/******************** view navigation utilities *********************/
-static void sima_zoom_set(SpaceImage *sima, ARegion *ar, float zoom, float location[2])
+static void sima_zoom_set(SpaceImage *sima, ARegion *ar, float zoom, const float location[2])
{
float oldzoom = sima->zoom;
int width, height;
@@ -123,7 +123,7 @@
}
}
-static void sima_zoom_set_factor(SpaceImage *sima, ARegion *ar, float zoomfac, float location[2])
+static void sima_zoom_set_factor(SpaceImage *sima, ARegion *ar, float zoomfac, const float location[2])
{
sima_zoom_set(sima, ar, sima->zoom * zoomfac, location);
}
Modified: trunk/blender/source/blender/editors/space_node/node_add.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_add.c 2013-05-08 12:54:07 UTC (rev 56544)
+++ trunk/blender/source/blender/editors/space_node/node_add.c 2013-05-08 12:54:33 UTC (rev 56545)
@@ -149,7 +149,7 @@
float point[2];
} bNodeSocketLink;
-static bNodeSocketLink *add_reroute_insert_socket_link(ListBase *lb, bNodeSocket *sock, bNodeLink *link, float point[2])
+static bNodeSocketLink *add_reroute_insert_socket_link(ListBase *lb, bNodeSocket *sock, bNodeLink *link, const float point[2])
{
bNodeSocketLink *socklink, *prev;
Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c 2013-05-08 12:54:07 UTC (rev 56544)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c 2013-05-08 12:54:33 UTC (rev 56545)
@@ -1200,7 +1200,7 @@
BLF_draw_default(1.5f * UI_UNIT_X, 1.5f * UI_UNIT_Y, 0.0f, info, sizeof(info));
}
-static void snode_setup_v2d(SpaceNode *snode, ARegion *ar, float center[2])
+static void snode_setup_v2d(SpaceNode *snode, ARegion *ar, const float center[2])
{
View2D *v2d = &ar->v2d;
More information about the Bf-blender-cvs
mailing list