griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Campbell Barton
2015-04-04 10:48:17 +11:00
parent 92c7632835
commit 519e20f984
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/animation/anim_channels_defines.c
View File

@@ -4206,7 +4206,7 @@ void ANIM_channel_draw_widgets(const bContext *C, bAnimContext *ac, bAnimListEle
UI_block_emboss_set(block, UI_EMBOSS);
but = uiDefButR(block, UI_BTYPE_TEXT, 1, "", offset + 3, yminc, RENAME_TEXT_WIDTH, channel_height,
&ptr, RNA_property_identifier(prop), -1, 0, 0, -1, -1, NULL);
&ptr, RNA_property_identifier(prop), -1, 0, 0, -1, -1, NULL);
/* copy what outliner does here, see outliner_buttons */
if (UI_but_active_only(C, ac->ar, block, but) == false) {

6
source/blender/editors/space_action/action_data.c
View File

@@ -23,7 +23,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
/** \file blender/editors/space_action/action_edit.c
/** \file blender/editors/space_action/action_data.c
* \ingroup spaction
*/
@@ -544,8 +544,8 @@ void ED_animedit_unlink_action(bContext *C, ID *id, AnimData *adt, bAction *act,
*/
if (act->id.us == 1) {
BKE_reportf(reports, RPT_ERROR,
"Action '%s' will not be saved, create Fake User or Stash in NLA Stack to retain",
act->id.name + 2);
"Action '%s' will not be saved, create Fake User or Stash in NLA Stack to retain",
act->id.name + 2);
}
/* If in Tweak Mode, don't unlink. Instead, this