diff options
-rw-r--r-- | release/scripts/startup/bl_ui/space_clip.py | 16 | ||||
-rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 7 | ||||
-rw-r--r-- | source/blender/editors/include/UI_icons.h | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_fcurve.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 2 |
5 files changed, 16 insertions, 15 deletions
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 0df3f2ed85c..88d556ae808 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -143,34 +143,34 @@ class CLIP_HT_header(Header): row.template_ID(sc, "clip", open="clip.open") else: row = layout.row(align=True) - props = row.operator("clip.refine_markers", text="", icon='LOOP_BACK') + props = row.operator("clip.refine_markers", text="", icon='TRACKING_REFINE_BACKWARDS') props.backwards = True row.separator() - props = row.operator("clip.clear_track_path", text="", icon='BACK') + props = row.operator("clip.clear_track_path", text="", icon='TRACKING_CLEAR_BACKWARDS') props.action = 'UPTO' row.separator() - props = row.operator("clip.track_markers", text="", icon='FRAME_PREV') + props = row.operator("clip.track_markers", text="", icon='TRACKING_BACKWARDS_SINGLE') props.backwards = True props.sequence = False props = row.operator("clip.track_markers", text="", - icon='PLAY_REVERSE') + icon='TRACKING_BACKWARDS') props.backwards = True props.sequence = True - props = row.operator("clip.track_markers", text="", icon='PLAY') + props = row.operator("clip.track_markers", text="", icon='TRACKING_FORWARDS') props.backwards = False props.sequence = True - props = row.operator("clip.track_markers", text="", icon='FRAME_NEXT') + props = row.operator("clip.track_markers", text="", icon='TRACKING_FORWARDS_SINGLE') props.backwards = False props.sequence = False row.separator() - props = row.operator("clip.clear_track_path", text="", icon='FORWARD') + props = row.operator("clip.clear_track_path", text="", icon='TRACKING_CLEAR_FORWARDS') props.action = 'REMAINED' row.separator() - props = row.operator("clip.refine_markers", text="", icon='LOOP_FORWARDS') + props = row.operator("clip.refine_markers", text="", icon='TRACKING_REFINE_FORWARDS') props.backwards = False layout.separator_spacer() diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 1dcf0a13055..8873a197aa8 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -4255,11 +4255,12 @@ static void draw_setting_widget(bAnimContext *ac, bAnimListElem *ale, const bAni void *ptr; const char *tooltip; uiBut *but = NULL; + bool enabled; /* get the flag and the pointer to that flag */ flag = acf->setting_flag(ac, setting, &negflag); ptr = acf->setting_ptr(ale, setting, &ptrsize); - /* enabled = ANIM_channel_setting_get(ac, ale, setting); */ /* UNUSED */ + enabled = ANIM_channel_setting_get(ac, ale, setting); /* get the base icon for the setting */ switch (setting) { @@ -4312,8 +4313,8 @@ static void draw_setting_widget(bAnimContext *ac, bAnimListElem *ale, const bAni break; case ACHANNEL_SETTING_MUTE: /* muted speaker */ - //icon = ((enabled) ? ICON_MUTE_IPO_ON : ICON_MUTE_IPO_OFF); - icon = ICON_MUTE_IPO_OFF; + icon = ((enabled) ? ICON_CHECKBOX_DEHLT : ICON_CHECKBOX_HLT); + usetoggle = false; if (ELEM(ale->type, ANIMTYPE_FCURVE, ANIMTYPE_NLACURVE)) { tooltip = TIP_("Does F-Curve contribute to result"); diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 5b6d39863f9..b45392a7f87 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -694,8 +694,8 @@ DEF_ICON(ORIENTATION_NORMAL) DEF_ICON(ORIENTATION_VIEW) /* EDITING */ -DEF_ICON(PASTEDOWN) DEF_ICON(COPYDOWN) +DEF_ICON(PASTEDOWN) DEF_ICON(PASTEFLIPUP) DEF_ICON(PASTEFLIPDOWN) DEF_ICON(VIS_SEL_11) @@ -781,8 +781,8 @@ DEF_ICON(SORTALPHA) DEF_ICON(SORTBYEXT) DEF_ICON(SORTTIME) DEF_ICON(SORTSIZE) -DEF_ICON(LONGDISPLAY) DEF_ICON(SHORTDISPLAY) +DEF_ICON(LONGDISPLAY) DEF_ICON_COLOR(GHOST) DEF_ICON_COLOR(IMGDISPLAY) DEF_ICON_BLANK(292) diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index 6b06ecb6452..dfa595d9b71 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -1399,7 +1399,7 @@ static void rna_def_fmodifier(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flag", FMODIFIER_FLAG_MUTED); RNA_def_property_ui_text(prop, "Muted", "F-Curve Modifier will not be evaluated"); RNA_def_property_update(prop, NC_ANIMATION | ND_KEYFRAME_PROP, "rna_FModifier_update"); - RNA_def_property_ui_icon(prop, ICON_MUTE_IPO_OFF, 1); + RNA_def_property_ui_icon(prop, ICON_CHECKBOX_DEHLT, 1); prop = RNA_def_property(srna, "is_valid", PROP_BOOLEAN, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_EDITABLE); diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index de39f50ba9b..fe36880657c 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -119,7 +119,7 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = { {eModifierType_ParticleInstance, "PARTICLE_INSTANCE", ICON_MOD_PARTICLES, "Particle Instance", ""}, {eModifierType_ParticleSystem, "PARTICLE_SYSTEM", ICON_MOD_PARTICLES, "Particle System", ""}, {eModifierType_Smoke, "SMOKE", ICON_MOD_SMOKE, "Smoke", ""}, - {eModifierType_Softbody, "SOFT_BODY", ICON_MODIFIER, "Soft Body", ""}, + {eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, "Soft Body", ""}, {eModifierType_Surface, "SURFACE", ICON_MODIFIER, "Surface", ""}, {0, NULL, 0, NULL, NULL} }; |