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:
authorThomas Dinges <blender@dingto.org>2012-12-29 05:14:03 +0400
committerThomas Dinges <blender@dingto.org>2012-12-29 05:14:03 +0400
commit6b211bac153aefce1087e6ac337613de17c4a53f (patch)
tree890e56f4b772a2c531788b529744e25cc6639bc9 /intern
parent19c4ae50e4255a978b4fb7cdc2a97c235af68929 (diff)
Fix for last commit, hair settings panel should also check on psys.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/addon/ui.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index c990e4e4e40..2d059b365a1 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -1008,7 +1008,7 @@ class CyclesParticle_PT_CurveSettings(CyclesButtonsPanel, Panel):
@classmethod
def poll(cls, context):
- use_curves = context.scene.cycles_curves.use_curves
+ use_curves = context.scene.cycles_curves.use_curves and context.particle_system
device_type = context.user_preferences.system.compute_device_type
experimental = context.scene.cycles.feature_set == 'EXPERIMENTAL' and (context.scene.cycles.device == 'CPU' or device_type == 'NONE')
return CyclesButtonsPanel.poll(context) and experimental and use_curves