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

4 files changed, 10 insertions, 51 deletions

diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py
index 0f26ff75715..7ce5733c6e2 100644
--- a/release/scripts/startup/bl_ui/__init__.py
+++ b/release/scripts/startup/bl_ui/__init__.py
@@ -70,7 +70,6 @@ _modules = [
     "space_graph",
     "space_image",
     "space_info",
-    "space_collections",
     "space_logic",
     "space_nla",
     "space_node",
diff --git a/release/scripts/startup/bl_ui/properties_collection.py b/release/scripts/startup/bl_ui/properties_collection.py
index 71da89fa10c..b838497b4e4 100644
--- a/release/scripts/startup/bl_ui/properties_collection.py
+++ b/release/scripts/startup/bl_ui/properties_collection.py
@@ -67,12 +67,12 @@ class COLLECTION_PT_objects(CollectionButtonsPanel, Panel):
         row.template_list("COLLECTION_UL_objects", "name", collection, "objects", collection.objects, "active_index", rows=2)
 
         col = row.column(align=True)
-        col.operator("collections.objects_add", icon='ZOOMIN', text="")
-        col.operator("collections.objects_remove", icon='ZOOMOUT', text="")
+        col.operator("outliner.collections_objects_add", icon='ZOOMIN', text="")
+        col.operator("outliner.collections_objects_remove", icon='ZOOMOUT', text="")
 
         row = layout.row(align=True)
-        row.operator("collections.objects_select", text="Select")
-        row.operator("collections.objects_deselect", text="Deselect")
+        row.operator("outliner.collections_objects_select", text="Select")
+        row.operator("outliner.collections_objects_deselect", text="Deselect")
 
 
 def template_engine_settings(col, settings, name, use_icon_view=False):
diff --git a/release/scripts/startup/bl_ui/space_collections.py b/release/scripts/startup/bl_ui/space_collections.py
deleted file mode 100644
index 9b612ce2ecd..00000000000
--- a/release/scripts/startup/bl_ui/space_collections.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 2
-#  of the License, or (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software Foundation,
-#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# <pep8 compliant>
-import bpy
-from bpy.types import Header, Menu
-
-
-class COLLECTIONS_HT_header(Header):
-    bl_space_type = 'COLLECTION_MANAGER'
-
-    def draw(self, context):
-        layout = self.layout
-
-        layout.template_header()
-
-        row = layout.row(align=True)
-        row.operator("collections.collection_new", text="", icon='NEW')
-        row.operator("collections.override_new", text="", icon='LINK_AREA')
-        row.operator("collections.collection_link", text="", icon='LINKED')
-        row.operator("collections.collection_unlink", text="", icon='UNLINKED')
-        row.operator("collections.delete", text="", icon='X')
-
-
-if __name__ == "__main__":  # only for live edit.
-    bpy.utils.register_module(__name__)
diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py
index eb3cef8012d..db91c382efb 100644
--- a/release/scripts/startup/bl_ui/space_outliner.py
+++ b/release/scripts/startup/bl_ui/space_outliner.py
@@ -59,14 +59,15 @@ class OUTLINER_HT_header(Header):
                 row.label(text="No Keying Set active")
         elif space.display_mode == 'ORPHAN_DATA':
             layout.operator("outliner.orphans_purge")
+
         elif space.display_mode == 'COLLECTIONS':
             row = layout.row(align=True)
 
-            row.operator("collections.collection_new", text="", icon='NEW')
-            row.operator("collections.override_new", text="", icon='LINK_AREA')
-            row.operator("collections.collection_link", text="", icon='LINKED')
-            row.operator("collections.collection_unlink", text="", icon='UNLINKED')
-            row.operator("collections.delete", text="", icon='X')
+            row.operator("outliner.collections_new", text="", icon='NEW')
+            row.operator("outliner.collections_override_new", text="", icon='LINK_AREA')
+            row.operator("outliner.collections_link", text="", icon='LINKED')
+            row.operator("outliner.collections_unlink", text="", icon='UNLINKED')
+            row.operator("outliner.collections_delete", text="", icon='X')
 
 
 class OUTLINER_MT_editor_menus(Menu):