diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-02-15 19:50:49 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-02-15 20:17:34 +0300 |
| commit | 574d6011f41f5c914f62e144cae1a5e3fe540de6 (patch) | |
| tree | 8957af98852fab5cb6936acfcf87e2780308dfa0 /source/blender/blenloader | |
| parent | a47235f5fd5e72a32bb42b025300ea2c2c8f205f (diff) | |
Revert "Collection Editor based on patch by Julian Eisel"
This reverts commit 3da834e83ce9d7056c033148dab04885a6d3b1b7.
We will use the outliner for this now.
I'm also moving the collections_ops.c to outliner_collections.c
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 14 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/writefile.c | 3 |
2 files changed, 0 insertions, 17 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 19023b26bdf..3413f30b9d8 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -103,8 +103,6 @@ #include "DNA_movieclip_types.h" #include "DNA_mask_types.h" -#include "RNA_access.h" - #include "MEM_guardedalloc.h" #include "BLI_endian_switch.h" @@ -6580,10 +6578,6 @@ static void lib_link_screen(FileData *fd, Main *main) slogic->gpd = newlibadr_us(fd, sc->id.lib, slogic->gpd); } - else if (sl->spacetype == SPACE_COLLECTIONS) { - SpaceCollections *slayer = (SpaceCollections *)sl; - slayer->flag |= SC_COLLECTION_DATA_REFRESH; - } } } sc->id.tag &= ~LIB_TAG_NEED_LINK; @@ -6969,10 +6963,6 @@ void blo_lib_link_screen_restore(Main *newmain, bScreen *curscreen, Scene *cursc slogic->gpd = restore_pointer_by_name(id_map, (ID *)slogic->gpd, USER_REAL); } - else if (sl->spacetype == SPACE_COLLECTIONS) { - SpaceCollections *slayer = (SpaceCollections *)sl; - slayer->flag |= SC_COLLECTION_DATA_REFRESH; - } } } } @@ -7367,10 +7357,6 @@ static bool direct_link_screen(FileData *fd, bScreen *sc) sclip->scopes.track_preview = NULL; sclip->scopes.ok = 0; } - else if (sl->spacetype == SPACE_COLLECTIONS) { - SpaceCollections *slayer = (SpaceCollections *)sl; - slayer->flag |= SC_COLLECTION_DATA_REFRESH; - } } BLI_listbase_clear(&sa->actionzones); diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index f781fbcdb18..ef46026f058 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -3136,9 +3136,6 @@ static void write_screens(WriteData *wd, ListBase *scrbase) else if (sl->spacetype == SPACE_INFO) { writestruct(wd, DATA, SpaceInfo, 1, sl); } - else if (sl->spacetype == SPACE_COLLECTIONS) { - writestruct(wd, DATA, SpaceCollections, 1, sl); - } } } } |