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
diff options
context:
space:
mode:
authorJanne Karhu <jhkarh@gmail.com>2011-01-23 00:22:29 +0300
committerJanne Karhu <jhkarh@gmail.com>2011-01-23 00:22:29 +0300
commitf39c794c7c3eca9c73ea0bdab084e6c191343965 (patch)
tree15cd3355216379d7344d06f32a3e7e3037be311a /release
parent3dc1c14a137c390f418897131367d8b5677b013c (diff)
Own mistake in fluid particles ui cleanup commit.
* Emission tab was shown without particle settings.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/ui/properties_particle.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/release/scripts/ui/properties_particle.py b/release/scripts/ui/properties_particle.py
index fbc4d932f32..9cde2891177 100644
--- a/release/scripts/ui/properties_particle.py
+++ b/release/scripts/ui/properties_particle.py
@@ -150,7 +150,12 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, bpy.types.Panel):
@classmethod
def poll(cls, context):
- if context.particle_system.settings.is_fluid:
+ psys = context.particle_system
+ if psys is None:
+ return False
+ if psys.settings is None:
+ return False
+ if psys.settings.is_fluid:
return False
if particle_panel_poll(PARTICLE_PT_emission, context):
return not context.particle_system.point_cache.use_external