diff options
author | Thomas Dinges <blender@dingto.org> | 2013-12-14 16:11:44 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-12-14 16:11:44 +0400 |
commit | b43ce8a1403c66aac4736cbdf724554599b98579 (patch) | |
tree | 5225c5d90199c19dbe07e3aed3a7e6caec1c47bf /intern/cycles/render | |
parent | 01fc7a687a19ef2dc8dac43ed9db69da35e3a55a (diff) |
Code cleanup / Cycles: Remove some unused hair code.
Diffstat (limited to 'intern/cycles/render')
-rw-r--r-- | intern/cycles/render/curves.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/render/curves.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/intern/cycles/render/curves.cpp b/intern/cycles/render/curves.cpp index 5730b5218ca..4e7f598751e 100644 --- a/intern/cycles/render/curves.cpp +++ b/intern/cycles/render/curves.cpp @@ -124,10 +124,8 @@ void CurveSystemManager::device_update(Device *device, DeviceScene *dscene, Scen if(line_method == CURVE_ACCURATE) kcurve->curveflags |= CURVE_KN_ACCURATE; - if(line_method == CURVE_CORRECTED) + else if(line_method == CURVE_CORRECTED) kcurve->curveflags |= CURVE_KN_INTERSECTCORRECTION; - if(line_method == CURVE_POSTCORRECTED) - kcurve->curveflags |= CURVE_KN_POSTINTERSECTCORRECTION; if(use_tangent_normal) kcurve->curveflags |= CURVE_KN_TANGENTGNORMAL; diff --git a/intern/cycles/render/curves.h b/intern/cycles/render/curves.h index ab74a356125..3dd492a29c4 100644 --- a/intern/cycles/render/curves.h +++ b/intern/cycles/render/curves.h @@ -49,7 +49,6 @@ typedef enum curve_triangles { typedef enum curve_lines { CURVE_ACCURATE, CURVE_CORRECTED, - CURVE_POSTCORRECTED, CURVE_UNCORRECTED } curve_lines; |