diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-09 10:04:17 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-09 10:04:17 +0400 |
| commit | dfdfa3d51b48a6bffd90779a1778dcf0e9a751e4 (patch) | |
| tree | f51a4ea8668ee41182a5d60942e96804004d3c7a /source/blender/render | |
| parent | 42517463821d0d0bbebe7c45bf40c06f4d8e9261 (diff) | |
code cleanup: replace macros VECCOPY, VECADD, VECSUB, INPR - with BLI_math funcs.
added copy float/double funcs: copy_v3fl_v3db(), copy_v3db_v3fl(). 2d & 4d too.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/shadeoutput.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index 115a913337f..85b545269e5 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -113,7 +113,7 @@ static void fogcolor(float *colf, float *rco, float *view) hor[2]= hor[2]*alpha; addAlphaOverFloat(colf, hor); - VECSUB(vec, vec, dview); + sub_v3_v3(vec, dview); } } #endif @@ -173,17 +173,17 @@ static void spothalo(struct LampRen *lar, ShadeInput *shi, float *intens) p1[1]= shi->co[1]-lar->co[1]; p1[2]= -lar->co[2]; mul_m3_v3(lar->imat, p1); - VECCOPY(npos, p1); // npos is double! + copy_v3db_v3fl(npos, p1); // npos is double! /* pre-scale */ npos[2] *= (double)lar->sh_zfac; } else { - VECCOPY(npos, lar->sh_invcampos); /* in initlamp calculated */ + copy_v3db_v3fl(npos, lar->sh_invcampos); /* in initlamp calculated */ } /* rotate view */ - VECCOPY(nray, shi->view); + copy_v3db_v3fl(nray, shi->view); mul_m3_v3_double(lar->imat, nray); if(R.wrld.mode & WO_MIST) { |