diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-27 07:12:31 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-27 07:12:31 +0400 |
| commit | effea8c29b9862e2526f2cf64811952a2971f5d6 (patch) | |
| tree | 72eb6486b146967e6533e8a18bc3735607f4ac16 /source/blender/render/intern/source/strand.c | |
| parent | 4d1e122d7becb573fea254474b349021e5293910 (diff) | |
| parent | f4dec97cef4b320c6f3ffd2ddc39d429da4fd4d5 (diff) | |
svn merge ^/trunk/blender -r40511:40587
Diffstat (limited to 'source/blender/render/intern/source/strand.c')
| -rw-r--r-- | source/blender/render/intern/source/strand.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/strand.c b/source/blender/render/intern/source/strand.c index 139eb41d771..e57141648e2 100644 --- a/source/blender/render/intern/source/strand.c +++ b/source/blender/render/intern/source/strand.c @@ -92,7 +92,7 @@ void strand_eval_point(StrandSegment *sseg, StrandPoint *spoint) Material *ma; StrandBuffer *strandbuf; float *simplify; - float p[4][3], data[4], cross[3], crosslen, w, dx, dy, t; + float p[4][3], data[4], cross[3], w, dx, dy, t; int type; strandbuf= sseg->buffer; @@ -164,7 +164,7 @@ void strand_eval_point(StrandSegment *sseg, StrandPoint *spoint) if(w > 0.0f) { if(strandbuf->flag & R_STRAND_B_UNITS) { - crosslen= len_v3(cross); + const float crosslen= len_v3(cross); w= 2.0f*crosslen*strandbuf->minwidth/w; if(spoint->width < w) { |