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/cycles/blender/addon | |
| 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/cycles/blender/addon')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 11 |
1 files changed, 5 insertions, 6 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() |