[Bf-blender-cvs] [c7752df86d4] blender2.8: Fix T57559: fix wrong disable/mute icons for particles and shape keys.

Brecht Van Lommel noreply at git.blender.org
Thu Nov 1 19:45:59 CET 2018


Commit: c7752df86d4fa5b0dd9ce40140637d4f21bb7977
Author: Brecht Van Lommel
Date:   Thu Nov 1 17:20:12 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBc7752df86d4fa5b0dd9ce40140637d4f21bb7977

Fix T57559: fix wrong disable/mute icons for particles and shape keys.

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

M	release/scripts/startup/bl_ui/properties_particle.py
M	source/blender/makesrna/intern/rna_key.c

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

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);



More information about the Bf-blender-cvs mailing list