diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-02 12:39:50 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-02 12:39:50 +0300 |
| commit | 24359063bf6ca2ec65a42d23032dc44b89d7d05d (patch) | |
| tree | 908677194e72457215476fe19e3c515fed09cc10 /source/blender/makesrna/intern/rna_space.c | |
| parent | b4deb499548c4a7a7e1a20f5a0002c21d6fb3646 (diff) | |
| parent | 1adfa36f88aa3c1273537e1566e166c8401d63e5 (diff) | |
Merge branch 'master' into depsgraph_refactor
Diffstat (limited to 'source/blender/makesrna/intern/rna_space.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 5b03b9e34e5..212bf5f66f3 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -1127,7 +1127,7 @@ static void rna_SpaceDopeSheetEditor_action_update(Main *bmain, Scene *scene, Po /* fix id-count of action we're replacing */ id_us_min(&adt->action->id); - /* show new id-count of action we're replacing */ + /* assign new action, and adjust the usercounts accordingly */ adt->action = saction->action; id_us_plus(&adt->action->id); @@ -1835,7 +1835,7 @@ static void rna_def_space_outliner(BlenderRNA *brna) {SO_LIBRARIES, "LIBRARIES", 0, "Blender File", "Display data of current file and linked libraries"}, {SO_DATABLOCKS, "DATABLOCKS", 0, "Datablocks", "Display all raw datablocks"}, {SO_USERDEF, "USER_PREFERENCES", 0, "User Preferences", "Display the user preference datablocks"}, - {SO_ID_ORPHANS, "ORPHANED_DATABLOCKS", 0, "Orphaned Datablocks", + {SO_ID_ORPHANS, "ORPHAN_DATA", 0, "Orphan Data", "Display datablocks which are unused and/or will be lost when the file is reloaded"}, {0, NULL, 0, NULL, NULL} }; |