[Bf-blender-cvs] [75e387d] master: error reordering args

[Campbell Barton]

Commit: 75e387d6c568f48e085553547b0cb2f2c9cada99
Author: Campbell Barton
Date:   Thu Jul 30 09:49:12 2015 +1000
Branches: master
https://developer.blender.org/rB75e387d6c568f48e085553547b0cb2f2c9cada99

error reordering args

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

M	source/blender/render/intern/source/render_texture.c

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

diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c
index fc95cf8..b282ec0 100644
--- a/source/blender/render/intern/source/render_texture.c
+++ b/source/blender/render/intern/source/render_texture.c
@@ -3527,8 +3527,9 @@ void render_realtime_texture(ShadeInput *shi, Image *ima)
 /* A modified part of shadeinput.c -> shade_input_set_uv()
  *  Used for sampling UV mapped texture color */
 static void textured_face_generate_uv(
-        float r_uv[2], const float normal[3], const float hit[3],
-        const float v1[3], const float v2[3], const float v3[3])
+        const float normal[3], const float hit[3],
+        const float v1[3], const float v2[3], const float v3[3],
+        float r_uv[2])
 {
 
 	float detsh, t00, t10, t01, t11;
@@ -3733,7 +3734,7 @@ void RE_sample_material_color(
 					const float *uv1, *uv2, *uv3;
 					const CustomData *data = &orcoDm->loopData;
 					const MLoopUV *mloopuv = data->layers[layer_index + i].data;
-					const float uv[2];
+					float uv[2];
 					float l;
 
 					/* point layer name from actual layer data */