diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-12-27 15:05:49 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-12-27 15:05:49 +0400 |
| commit | 76b562237f31a804cd2eba9e3af6effa54f31b5b (patch) | |
| tree | d789e373995ad0ab4ca0fb5668937c5b7814bb2d /intern/cycles/render/curves.cpp | |
| parent | 03e388127034c35c82ed0f84b2239125111db5a4 (diff) | |
| parent | d09a8ea9e7a8ad208326b99a0631e9efc7119fbd (diff) | |
Merge branch 'master' into soc-2013-depsgraph_mtsoc-2013-depsgraph_mt
Conflicts:
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/shrinkwrap.c
source/blender/collada/AnimationExporter.cpp
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_util.c
source/blender/render/intern/source/pipeline.c
Diffstat (limited to 'intern/cycles/render/curves.cpp')
| -rw-r--r-- | intern/cycles/render/curves.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/intern/cycles/render/curves.cpp b/intern/cycles/render/curves.cpp index 4e7f598751e..574ad4f6ca0 100644 --- a/intern/cycles/render/curves.cpp +++ b/intern/cycles/render/curves.cpp @@ -92,7 +92,6 @@ CurveSystemManager::CurveSystemManager() use_curves = true; use_encasing = true; use_backfacing = false; - use_tangent_normal = false; use_tangent_normal_geometry = false; need_update = true; @@ -127,8 +126,6 @@ void CurveSystemManager::device_update(Device *device, DeviceScene *dscene, Scen else if(line_method == CURVE_CORRECTED) kcurve->curveflags |= CURVE_KN_INTERSECTCORRECTION; - if(use_tangent_normal) - kcurve->curveflags |= CURVE_KN_TANGENTGNORMAL; if(use_tangent_normal_geometry) kcurve->curveflags |= CURVE_KN_TRUETANGENTGNORMAL; if(use_backfacing) @@ -158,7 +155,6 @@ bool CurveSystemManager::modified(const CurveSystemManager& CurveSystemManager) line_method == CurveSystemManager.line_method && primitive == CurveSystemManager.primitive && use_encasing == CurveSystemManager.use_encasing && - use_tangent_normal == CurveSystemManager.use_tangent_normal && use_tangent_normal_geometry == CurveSystemManager.use_tangent_normal_geometry && encasing_ratio == CurveSystemManager.encasing_ratio && minimum_width == CurveSystemManager.minimum_width && |