Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-10-04 22:04:29 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-10-04 22:04:29 +0400
commit4c5d6dcbafeafa724530950c8b9f19306c802239 (patch)
treeecd71426b4f88ecd75e8536f2ae24ecbac689d3f /intern
parentb0c36617c61bde04af9647f7721df29997e15ac0 (diff)
Fix cycles hair render UI panel showing for particles that are not hair,
patch by Greg Zaal.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/addon/ui.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 7b596b18a49..7a03df4f35a 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -1180,7 +1180,7 @@ class CyclesRender_PT_CurveRendering(CyclesButtonsPanel, Panel):
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 @@ class CyclesParticle_PT_CurveSettings(CyclesButtonsPanel, Panel):
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