diff options
| author | Ines Almeida <britalmeida@gmail.com> | 2015-01-13 14:04:25 +0300 |
|---|---|---|
| committer | Ines Almeida <britalmeida@gmail.com> | 2015-01-13 14:04:25 +0300 |
| commit | cb61c5aeee94af943b0306550daef45c2018126a (patch) | |
| tree | dbb2a9b5600bc53de35162e79091772bff1b6f8b /source/blender/render/intern/source/convertblender.c | |
| parent | d7cabe7d6f4519856969137df415692e16a5372d (diff) | |
| parent | 117edbbf881be1764db852d9805c523590a19f84 (diff) | |
Merge branch 'master' into soc-2014-bgesoc-2014-bge
Diffstat (limited to 'source/blender/render/intern/source/convertblender.c')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index c7170cfa4b4..35878f664ea 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -2721,12 +2721,13 @@ static void init_render_curve(Render *re, ObjectRen *obr, int timeoffset) vlr->v4= NULL; /* to prevent float accuracy issues, we calculate normal in local object space (not world) */ - if (area_tri_v3(co3, co2, co1)>FLT_EPSILON) { - if (negative_scale) - normal_tri_v3(tmp, co1, co2, co3); - else - normal_tri_v3(tmp, co3, co2, co1); - add_v3_v3(n, tmp); + if (normal_tri_v3(tmp, co1, co2, co3) > FLT_EPSILON) { + if (negative_scale == false) { + add_v3_v3(n, tmp); + } + else { + sub_v3_v3(n, tmp); + } } vlr->mat= matar[ dl->col ]; |