diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-01 19:20:12 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-01 21:31:20 +0300 |
| commit | c7752df86d4fa5b0dd9ce40140637d4f21bb7977 (patch) | |
| tree | 04bd4bf36224ce58ecd04373d89bfc6a907ee6ac | |
| parent | 97bb56711e17fca6f0520e84d23d2f039bcd5626 (diff) | |
Fix T57559: fix wrong disable/mute icons for particles and shape keys.
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_particle.py | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_key.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index ffd32c5da64..1618b2dccfa 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -126,14 +126,12 @@ class PARTICLE_UL_particle_systems(bpy.types.UIList): "show_render", emboss=False, icon_only=True, - icon='RESTRICT_RENDER_OFF' if md.show_render else 'RESTRICT_RENDER_ON', ) layout.prop( md, "show_viewport", emboss=False, icon_only=True, - icon='RESTRICT_VIEW_OFF' if md.show_viewport else 'RESTRICT_VIEW_ON', ) elif self.layout_type == 'GRID': diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c index 11fb5f7f94b..15011dbf07c 100644 --- a/source/blender/makesrna/intern/rna_key.c +++ b/source/blender/makesrna/intern/rna_key.c @@ -722,7 +722,7 @@ static void rna_def_keyblock(BlenderRNA *brna) prop = RNA_def_property(srna, "mute", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", KEYBLOCK_MUTE); RNA_def_property_ui_text(prop, "Mute", "Mute this shape key"); - RNA_def_property_ui_icon(prop, ICON_RESTRICT_VIEW_OFF, 1); + RNA_def_property_ui_icon(prop, ICON_HIDE_ON, -1); RNA_def_property_update(prop, 0, "rna_Key_update_data"); prop = RNA_def_property(srna, "slider_min", PROP_FLOAT, PROP_NONE); |