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:
authorDalai Felinto <dfelinto@gmail.com>2017-02-15 19:50:49 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-02-15 20:17:34 +0300
commit574d6011f41f5c914f62e144cae1a5e3fe540de6 (patch)
tree8957af98852fab5cb6936acfcf87e2780308dfa0 /source/blender/makesdna/DNA_space_types.h
parenta47235f5fd5e72a32bb42b025300ea2c2c8f205f (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/makesdna/DNA_space_types.h')
-rw-r--r--source/blender/makesdna/DNA_space_types.h19
1 files changed, 2 insertions, 17 deletions
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 3524c041069..350b9675e9e 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -1345,20 +1345,6 @@ typedef enum eSpaceClip_GPencil_Source {
SC_GPENCIL_SRC_TRACK = 1,
} eSpaceClip_GPencil_Source;
-/* Collection Manager ======================================= */
-
-typedef struct SpaceCollections {
- SpaceLink *next, *prev;
- ListBase regionbase; /* storage of regions for inactive spaces */
- int spacetype;
- int flag; /* eSpaceCollections_Flag */
-} SpaceCollections;
-
-/* SpaceClip->flag */
-typedef enum eSpaceCollections_Flag {
- SC_COLLECTION_DATA_REFRESH = (1 << 0), /* recreate/update SpaceCollections layer data, needed for undo/read/write */
-} eSpaceCollections_Flag;
-
/* **************** SPACE DEFINES ********************* */
/* space types, moved from DNA_screen_types.h */
@@ -1388,9 +1374,8 @@ typedef enum eSpace_Type {
SPACE_CONSOLE = 18,
SPACE_USERPREF = 19,
SPACE_CLIP = 20,
- SPACE_COLLECTIONS = 21,
-
- SPACEICONMAX = SPACE_COLLECTIONS
+
+ SPACEICONMAX = SPACE_CLIP
} eSpace_Type;
/* use for function args */