diff options
author | Thomas Dinges <blender@dingto.org> | 2013-12-26 06:25:13 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-12-26 06:25:30 +0400 |
commit | 03fed41e59cc9247f7db6af33b2e76b6b05340f7 (patch) | |
tree | 7066a78c7db0b43916541ac5a9ce456771b4ec39 /intern | |
parent | db8293d4561791b4ddb349fa3ce37803afe509ee (diff) |
Cycles / Hair: Further cleanup of UI and internals.
* UI: Remove deprecated condition (CURVE_RIBBONS) and hide backface property, when it's hardcoded in C (Curve/Line segments && Ribbons).
* Remove "use_tangent_normal" and "CURVE_KN_TANGENTGNORMAL" as its unused (follow up for last commit).
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 11 | ||||
-rw-r--r-- | intern/cycles/blender/blender_curves.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_types.h | 3 | ||||
-rw-r--r-- | intern/cycles/render/curves.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/render/curves.h | 1 |
5 files changed, 6 insertions, 15 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 8f81e93f7c8..83483cbcae9 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -1172,13 +1172,12 @@ class CyclesRender_PT_CurveRendering(CyclesButtonsPanel, Panel): layout.prop(ccscene, "primitive", text="Primitive") layout.prop(ccscene, "shape", text="Shape") - if ccscene.primitive == 'TRIANGLES': - if ccscene.shape == 'THICK': - layout.prop(ccscene, "resolution", text="Resolution") - elif ccscene.primitive == 'LINE_SEGMENTS': - layout.prop(ccscene, "cull_backfacing", text="Cull back-faces") - elif ccscene.primitive in {'CURVE_SEGMENTS', 'CURVE_RIBBONS'}: + if (ccscene.primitive in {'CURVE_SEGMENTS', 'LINE_SEGMENTS'} and ccscene.shape == 'RIBBONS') == False: layout.prop(ccscene, "cull_backfacing", text="Cull back-faces") + + if ccscene.primitive == 'TRIANGLES' and ccscene.shape == 'THICK': + layout.prop(ccscene, "resolution", text="Resolution") + elif ccscene.primitive == 'CURVE_SEGMENTS': layout.prop(ccscene, "subdivisions", text="Curve subdivisions") row = layout.row() diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp index d13c532533e..7e8eb3aa374 100644 --- a/intern/cycles/blender/blender_curves.cpp +++ b/intern/cycles/blender/blender_curves.cpp @@ -710,13 +710,11 @@ void BlenderSync::sync_curve_settings() curve_system_manager->line_method = CURVE_UNCORRECTED; curve_system_manager->use_encasing = true; curve_system_manager->use_backfacing = false; - curve_system_manager->use_tangent_normal = true; curve_system_manager->use_tangent_normal_geometry = true; } else if(curve_system_manager->primitive == CURVE_LINE_SEGMENTS && curve_system_manager->curve_shape == CURVE_THICK) { curve_system_manager->line_method = CURVE_ACCURATE; curve_system_manager->use_encasing = false; - curve_system_manager->use_tangent_normal = false; curve_system_manager->use_tangent_normal_geometry = false; } else if(curve_system_manager->primitive == CURVE_SEGMENTS && curve_system_manager->curve_shape == CURVE_RIBBON) { diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index fb63ebb2e7a..9b1893e8baa 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -792,8 +792,7 @@ typedef enum CurveFlag { CURVE_KN_ACCURATE = 8, /* use accurate intersections test? */ CURVE_KN_INTERSECTCORRECTION = 16, /* correct for width after determing closest midpoint? */ CURVE_KN_TRUETANGENTGNORMAL = 32, /* use tangent normal for geometry? */ - CURVE_KN_TANGENTGNORMAL = 64, /* use tangent normal for shader? */ - CURVE_KN_RIBBONS = 128, /* use flat curve ribbons */ + CURVE_KN_RIBBONS = 64, /* use flat curve ribbons */ } CurveFlag; typedef struct KernelCurves { 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 && diff --git a/intern/cycles/render/curves.h b/intern/cycles/render/curves.h index 0759d495561..8020a93e77e 100644 --- a/intern/cycles/render/curves.h +++ b/intern/cycles/render/curves.h @@ -97,7 +97,6 @@ public: bool use_curves; bool use_encasing; bool use_backfacing; - bool use_tangent_normal; bool use_tangent_normal_geometry; bool need_update; |