From 75e387d6c568f48e085553547b0cb2f2c9cada99 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 30 Jul 2015 09:49:12 +1000 Subject: error reordering args --- source/blender/render/intern/source/render_texture.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source/blender/render') diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index fc95cf8c275..b282ec0593e 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 */ -- cgit v1.2.3