diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-01-29 22:25:35 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-01-29 22:29:20 +0300 |
| commit | 3984586292855bb6710facf5845b44f5d11dcc6f (patch) | |
| tree | c649e5d521ad4f9012276fcf0175f4e75db22bb7 /release | |
| parent | 35c6d68d35699fe088537074ebaa5034c8e6321e (diff) | |
| parent | e4faed120d9c294ea5d6061b3213ed4f6784db52 (diff) | |
Merge branch 'blender-v2.82-release'
Merge conflict in source/blender/gpu/GPU_texture.h
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_particle.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 34ff386893b..3384032e332 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -584,7 +584,7 @@ class PARTICLE_PT_rotation(ParticleButtonsPanel, Panel): layout = self.layout layout.prop(part, "use_rotations", text="") - layout.enabled = particle_panel_enabled(context, psys) and part.use_rotations + layout.enabled = particle_panel_enabled(context, psys) def draw(self, context): |