[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60554] trunk/blender/intern/cycles/ blender/addon/ui.py: Fix cycles hair render UI panel showing for particles that are not hair,

[Brecht Van Lommel]

Revision: 60554
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60554
Author:   blendix
Date:     2013-10-04 18:04:29 +0000 (Fri, 04 Oct 2013)
Log Message:
-----------
Fix cycles hair render UI panel showing for particles that are not hair,
patch by Greg Zaal.

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

Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py	2013-10-04 17:49:26 UTC (rev 60553)
+++ trunk/blender/intern/cycles/blender/addon/ui.py	2013-10-04 18:04:29 UTC (rev 60554)
@@ -1180,7 +1180,7 @@
         scene = context.scene
         cscene = scene.cycles
         psys = context.particle_system
-        return CyclesButtonsPanel.poll(context) and psys
+        return CyclesButtonsPanel.poll(context) and psys and psys.settings.type == 'HAIR'
 
     def draw_header(self, context):
         ccscene = context.scene.cycles_curves
@@ -1220,8 +1220,9 @@
         scene = context.scene
         cscene = scene.cycles
         ccscene = scene.cycles_curves
-        use_curves = ccscene.use_curves and context.particle_system
-        return CyclesButtonsPanel.poll(context) and use_curves
+        psys = context.particle_system
+        use_curves = ccscene.use_curves and psys
+        return CyclesButtonsPanel.poll(context) and use_curves and psys.settings.type == 'HAIR'
 
     def draw(self, context):
         layout = self.layout