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/editors/interface/resources.c | |
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/editors/interface/resources.c')
-rw-r--r-- | source/blender/editors/interface/resources.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index fbfbdb13a5f..a6235a8d26d 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -167,9 +167,6 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo case SPACE_CLIP: ts = &btheme->tclip; break; - case SPACE_COLLECTIONS: - ts = &btheme->tcollections; - break; default: ts = &btheme->tv3d; break; @@ -1211,11 +1208,6 @@ void ui_theme_init_default(void) rgba_char_args_set(btheme->tclip.strip_select, 0xff, 0x8c, 0x00, 0xff); btheme->tclip.handle_vertex_size = 5; ui_theme_space_init_handles_color(&btheme->tclip); - - /* space collection manager */ - btheme->tcollections = btheme->tv3d; - rgba_char_args_set_fl(btheme->tcollections.back, 0.42, 0.42, 0.42, 1.0); - rgba_char_args_set(btheme->tcollections.hilite, 255, 140, 25, 255); /* selected files */ } void ui_style_init_default(void) @@ -2879,11 +2871,7 @@ void init_userdef_do_versions(void) * (keep this block even if it becomes empty). */ { - for (bTheme *btheme = U.themes.first; btheme; btheme = btheme->next) { - btheme->tcollections = btheme->tv3d; - rgba_char_args_set_fl(btheme->tcollections.back, 0.42, 0.42, 0.42, 1.0); - rgba_char_args_set(btheme->tcollections.hilite, 255, 140, 25, 255); /* selected files */ - } + } if (U.pixelsize == 0.0f) |