diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-09-16 19:34:31 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-09-16 19:34:31 +0400 |
| commit | da5ce8cb1ce8ab85042f9d47ddedef3b96a3757d (patch) | |
| tree | d929023e597610d6af8a6899690ba77ebdf1d8cf /intern | |
| parent | 786b26438e66e9b1a3e8bacbab557b9ca1385db2 (diff) | |
Cycles / Hair:
* Hair rendering is now a supported feature, no further need to change the feature set to "Experimental".
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 6 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_mesh.cpp | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 6f7de318463..5fa497776fe 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -1178,8 +1178,7 @@ class CyclesRender_PT_CurveRendering(CyclesButtonsPanel, Panel): scene = context.scene cscene = scene.cycles psys = context.particle_system - experimental = (cscene.feature_set == 'EXPERIMENTAL') - return CyclesButtonsPanel.poll(context) and experimental and psys + return CyclesButtonsPanel.poll(context) and psys def draw_header(self, context): ccscene = context.scene.cycles_curves @@ -1220,8 +1219,7 @@ class CyclesParticle_PT_CurveSettings(CyclesButtonsPanel, Panel): cscene = scene.cycles ccscene = scene.cycles_curves use_curves = ccscene.use_curves and context.particle_system - experimental = cscene.feature_set == 'EXPERIMENTAL' - return CyclesButtonsPanel.poll(context) and experimental and use_curves + return CyclesButtonsPanel.poll(context) and use_curves def draw(self, context): layout = self.layout diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index 628f9dae695..caa61e0c5d7 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -487,7 +487,7 @@ Mesh *BlenderSync::sync_mesh(BL::Object b_ob, bool object_updated, bool hide_tri create_mesh(scene, mesh, b_mesh, used_shaders); } - if(render_layer.use_hair && experimental) + if(render_layer.use_hair) sync_curves(mesh, b_mesh, b_ob, object_updated); /* free derived mesh */ |