diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-03-15 20:24:05 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-15 20:26:23 +0400 |
commit | 2097e621edcf7658895b9f6ba9cc4e51f5538369 (patch) | |
tree | 9f112e8a2b35fed01734ed355d3832cd857de826 /source/blender/makesrna | |
parent | 38244166b03bc4a01d8c0b99e2fd2cb2c9b60012 (diff) |
Code cleanup: use r_ prefix for return args
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_camera_api.c | 10 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_texture_api.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/makesrna/intern/rna_camera_api.c b/source/blender/makesrna/intern/rna_camera_api.c index bf916806e40..ae15c58dd29 100644 --- a/source/blender/makesrna/intern/rna_camera_api.c +++ b/source/blender/makesrna/intern/rna_camera_api.c @@ -42,16 +42,16 @@ #include "BKE_object.h" static void rna_camera_view_frame(struct Camera *camera, struct Scene *scene, - float vec1_r[3], float vec2_r[3], float vec3_r[3], float vec4_r[3]) + float r_vec1[3], float r_vec2[3], float r_vec3[3], float r_vec4[3]) { float vec[4][3]; BKE_camera_view_frame(scene, camera, vec); - copy_v3_v3(vec1_r, vec[0]); - copy_v3_v3(vec2_r, vec[1]); - copy_v3_v3(vec3_r, vec[2]); - copy_v3_v3(vec4_r, vec[3]); + copy_v3_v3(r_vec1, vec[0]); + copy_v3_v3(r_vec2, vec[1]); + copy_v3_v3(r_vec3, vec[2]); + copy_v3_v3(r_vec4, vec[3]); } #else diff --git a/source/blender/makesrna/intern/rna_texture_api.c b/source/blender/makesrna/intern/rna_texture_api.c index 3a91796a727..695a3e0548e 100644 --- a/source/blender/makesrna/intern/rna_texture_api.c +++ b/source/blender/makesrna/intern/rna_texture_api.c @@ -69,17 +69,17 @@ static void clear_envmap(struct EnvMap *env, bContext *C) } } -static void texture_evaluate(struct Tex *tex, float value[3], float color_r[4]) +static void texture_evaluate(struct Tex *tex, float value[3], float r_color[4]) { TexResult texres = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, NULL}; /* TODO(sergey): always use color management now. */ multitex_ext(tex, value, NULL, NULL, 1, &texres, NULL, true); - color_r[0] = texres.tr; - color_r[1] = texres.tg; - color_r[2] = texres.tb; - color_r[3] = texres.tin; + r_color[0] = texres.tr; + r_color[1] = texres.tg; + r_color[2] = texres.tb; + r_color[3] = texres.tin; } #else |