diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-07-30 02:49:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-07-30 02:58:00 +0300 |
| commit | 75e387d6c568f48e085553547b0cb2f2c9cada99 (patch) | |
| tree | a7736c9499e14df7fd711813643a6dbe49c74961 /source/blender/render | |
| parent | 4737b1246241fd575921f93ddf229da656c7fb5a (diff) | |
error reordering args
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/render_texture.c | 7 |
1 files changed, 4 insertions, 3 deletions
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 */ |