[Bf-blender-cvs] [d51b74f9e3d] master: Fix T66053: hair shape panel shows for emitter particles

Brecht Van Lommel noreply at git.blender.org
Mon Jun 24 14:02:53 CEST 2019


Commit: d51b74f9e3de4379dc675e08df8766b37105ee0e
Author: Brecht Van Lommel
Date:   Mon Jun 24 14:02:23 2019 +0200
Branches: master
https://developer.blender.org/rBd51b74f9e3de4379dc675e08df8766b37105ee0e

Fix T66053: hair shape panel shows for emitter particles

===================================================================

M	release/scripts/startup/bl_ui/properties_particle.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py
index 52089fa816d..c4b6168be61 100644
--- a/release/scripts/startup/bl_ui/properties_particle.py
+++ b/release/scripts/startup/bl_ui/properties_particle.py
@@ -1947,9 +1947,10 @@ class PARTICLE_PT_hair_shape(ParticleButtonsPanel, Panel):
 
     @classmethod
     def poll(cls, context):
-        if context.particle_system is None:
+        psys = context.particle_system
+        if psys is None:
             return False
-        return particle_panel_poll(cls, context)
+        return particle_panel_poll(cls, context) and psys.settings.type == 'HAIR'
 
     def draw(self, context):
         layout = self.layout



More information about the Bf-blender-cvs mailing list