[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60169] trunk/blender/intern/cycles/ blender: Cycles / Hair:

[Thomas Dinges]

Revision: 60169
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60169
Author:   dingto
Date:     2013-09-16 15:34:31 +0000 (Mon, 16 Sep 2013)
Log Message:
-----------
Cycles / Hair:
* Hair rendering is now a supported feature, no further need to change the feature set to "Experimental". 

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/addon/ui.py
    trunk/blender/intern/cycles/blender/blender_mesh.cpp

Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py	2013-09-16 15:33:28 UTC (rev 60168)
+++ trunk/blender/intern/cycles/blender/addon/ui.py	2013-09-16 15:34:31 UTC (rev 60169)
@@ -1178,8 +1178,7 @@
         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 @@
         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

Modified: trunk/blender/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_mesh.cpp	2013-09-16 15:33:28 UTC (rev 60168)
+++ trunk/blender/intern/cycles/blender/blender_mesh.cpp	2013-09-16 15:34:31 UTC (rev 60169)
@@ -487,7 +487,7 @@
 					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 */