Cycles / Hair:
authorThomas Dinges <blender@dingto.org>
Mon, 16 Sep 2013 15:34:31 +0000 (15:34 +0000)
committerThomas Dinges <blender@dingto.org>
Mon, 16 Sep 2013 15:34:31 +0000 (15:34 +0000)
* Hair rendering is now a supported feature, no further need to change the feature set to "Experimental".

intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_mesh.cpp

index 6f7de3184631476574aba3c90c5cfb52ff8341cf..5fa497776fe542f8d839c26399cc6f2aabcb9889 100644 (file)
@@ -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
index 628f9dae695aa36c51d5269f3e15e73ebe0ee565..caa61e0c5d7385b9537f95b7b3e230cf611b7160 100644 (file)
@@ -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 */