[Bf-blender-cvs] [88a872dd6ea] master: Fix T68227: Pinning the particles system data-block causes error

Sybren A. Stüvel noreply at git.blender.org
Tue Aug 6 15:31:53 CEST 2019


Commit: 88a872dd6eac10e99afbd18243d39be68921642a
Author: Sybren A. Stüvel
Date:   Tue Aug 6 15:31:39 2019 +0200
Branches: master
https://developer.blender.org/rB88a872dd6eac10e99afbd18243d39be68921642a

Fix T68227: Pinning the particles system data-block causes error

The 'Seed' setting is not part of the pinned data-block. When pinning,
the local variable `psys` is `None`, and this wasn't properly checked for
when drawing the 'Seed' setting.

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

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 02b809cdfb4..ebbf278c5e7 100644
--- a/release/scripts/startup/bl_ui/properties_particle.py
+++ b/release/scripts/startup/bl_ui/properties_particle.py
@@ -272,7 +272,9 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, Panel):
         col = layout.column()
         col.active = part.emit_from == 'VERT' or part.distribution != 'GRID'
         col.prop(part, "count")
-        col.prop(psys, "seed")
+
+        if psys is not None:
+            col.prop(psys, "seed")
 
         if part.type == 'HAIR':
             col.prop(part, "hair_length")



More information about the Bf-blender-cvs mailing list