[Bf-blender-cvs] [d970f02] master: Fix particle count being grayed out when emitting from verts, but grid is on.

[Eberhard Höpfner]

Commit: d970f02ee162c2bb3191fb17d7be85ad71becbfc
Author: Eberhard Höpfner
Date:   Thu Dec 17 01:17:55 2015 +0100
Branches: master
https://developer.blender.org/rBd970f02ee162c2bb3191fb17d7be85ad71becbfc

Fix particle count being grayed out when emitting from verts, but grid is on.

Differential Revision: https://developer.blender.org/D1675

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

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 e294f54..207f6f8 100644
--- a/release/scripts/startup/bl_ui/properties_particle.py
+++ b/release/scripts/startup/bl_ui/properties_particle.py
@@ -253,7 +253,7 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, Panel):
         layout.enabled = particle_panel_enabled(context, psys) and (psys is None or not psys.has_multiple_caches)
 
         row = layout.row()
-        row.active = part.distribution != 'GRID'
+        row.active = part.emit_from == 'VERT' or part.distribution != 'GRID'
         row.prop(part, "count")
 
         if part.type == 'HAIR':