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:
authorWilliam Reynish <billrey@me.com>2019-05-19 21:23:58 +0300
committerWilliam Reynish <billrey@me.com>2019-05-19 21:23:58 +0300
commit758c25d89d2da049a3caf928c5252e31d1531cd3 (patch)
tree394c21e30c642553771e9fe8bd5b3669a60d9f32 /source/blender
parent5adb3607dc65f99e8eef538043842e23e23ee5f2 (diff)
UI: Icons update
A few icons were missed in the last update. - Added dedicated icon for showing hidden objects in the Graph Editor - Added new, more descriptive icon for F-Curve snapshots - Tweaks for Toggle Full Screen and Collections icons This should be the final set for 2.80. Thanks to Andrzej Ambroż for contributing this icon set.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/editors/include/UI_icons.h4
-rw-r--r--source/blender/makesrna/intern/rna_action.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index f54e4d1c61b..90105ac630e 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -96,8 +96,8 @@ DEF_ICON(PINNED)
DEF_ICON(SCREEN_BACK)
DEF_ICON(RIGHTARROW)
DEF_ICON(DOWNARROW_HLT)
-DEF_ICON_BLANK(103)
-DEF_ICON_BLANK(104)
+DEF_ICON(FCURVE_SNAPSHOT)
+DEF_ICON(OBJECT_HIDDEN)
DEF_ICON_BLANK(105)
DEF_ICON_BLANK(106)
DEF_ICON(PLUGIN)
diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c
index e99a1ffe2be..af6d01d9e86 100644
--- a/source/blender/makesrna/intern/rna_action.c
+++ b/source/blender/makesrna/intern/rna_action.c
@@ -341,7 +341,7 @@ static void rna_def_dopesheet(BlenderRNA *brna)
RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_INCL_HIDDEN);
RNA_def_property_ui_text(
prop, "Display Hidden", "Include channels from objects/bone that are not visible");
- RNA_def_property_ui_icon(prop, ICON_GHOST_ENABLED, 0);
+ RNA_def_property_ui_icon(prop, ICON_OBJECT_HIDDEN, 0);
RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
prop = RNA_def_property(srna, "use_datablock_sort", PROP_BOOLEAN, PROP_NONE);