Commit: 574d6011f41f5c914f62e144cae1a5e3fe540de6
Author: Dalai Felinto
Date: Wed Feb 15 17:50:49 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB574d6011f41f5c914f62e144cae1a5e3fe540de6
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
===================================================================
M build_files/cmake/macros.cmake
M release/scripts/startup/bl_ui/__init__.py
M release/scripts/startup/bl_ui/properties_collection.py
D release/scripts/startup/bl_ui/space_collections.py
M release/scripts/startup/bl_ui/space_outliner.py
M source/blender/blenkernel/BKE_context.h
M source/blender/blenkernel/intern/context.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/CMakeLists.txt
M source/blender/editors/include/BIF_glutil.h
M source/blender/editors/include/ED_object.h
M source/blender/editors/include/ED_screen.h
M source/blender/editors/include/ED_space_api.h
M source/blender/editors/include/UI_interface.h
M source/blender/editors/include/UI_interface_icons.h
M source/blender/editors/interface/interface_icons.c
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/interface/resources.c
M source/blender/editors/screen/glutil.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/space_api/spacetypes.c
D source/blender/editors/space_collections/CMakeLists.txt
D source/blender/editors/space_collections/collections_intern.h
D source/blender/editors/space_collections/space_collections.c
M source/blender/editors/space_outliner/CMakeLists.txt
R068 source/blender/editors/space_collections/collections_ops.c
source/blender/editors/space_outliner/outliner_collections.c
M source/blender/editors/space_outliner/outliner_intern.h
M source/blender/editors/space_outliner/outliner_ops.c
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/python/intern/bpy_rna_callback.c
M source/blender/windowmanager/WM_types.h
M source/blender/windowmanager/intern/wm_keymap.c
===================================================================
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index fa9c2a28cb..311228eab3 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -566,7 +566,6 @@ function(SETUP_BLENDER_SORTED_LIBS)
bf_editor_space_userpref
bf_editor_space_view3d
bf_editor_space_clip
- bf_editor_space_collections
bf_editor_transform
bf_editor_util
diff --git a/release/scripts/startup/bl_ui/__init__.py
b/release/scripts/startup/bl_ui/__init__.py
index 0f26ff7571..7ce5733c6e 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 71da89fa10..b838497b4e 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 9b612ce2ec..0000000000
--- 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 eb3cef8012..db91c382ef 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):
diff --git a/source/blender/blenkernel/BKE_context.h
b/source/blender/blenkernel/BKE_context.h
index 23f9ff28f8..606b045dff 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -170,7 +170,6 @@ struct SpaceAction *CTX_wm_space_action(const bContext *C);
struct SpaceInfo *CTX_wm_space_info(const bContext *C);
struct SpaceUserPref *CTX_wm_space_userpref(const bContext *C);
struct SpaceClip *CTX_wm_space_clip(const bContext *C);
-struct SpaceCollections *CTX_wm_space_collections(const bContext *C);
void CTX_wm_manager_set(bContext *C, struct wmWindowManager *wm);
void CTX_wm_window_set(bContext *C, struct wmWindow *win);
diff --git a/source/blender/blenkernel/intern/context.c
b/source/blender/blenkernel/intern/context.c
index a7c53dda8c..39c595dfdb 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -815,14 +815,6 @@ struct SpaceClip *CTX_wm_space_clip(const bContext *C)
return NULL;
}
-struct SpaceCollections *CTX_wm_space_collections(const bContext *C)
-{
- ScrArea *sa = CTX_wm_area(C);
- if (sa && sa->spacetype == SPACE_COLLECTIONS)
- return sa->spacedata.first;
- return NULL;
-}
-
void CTX_wm_manager_set(bContext *C, wmWindowManager *wm)
{
C->wm.manager = wm;
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index 19023b26bd..3413f30b9d 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 f781fbcdb1..ef46026f05 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);
- }
}
}
}
diff --git a/source/blender/editors/CMakeLists.txt
b/source/blender/editors/CMakeLists.txt
index 7e804a5bbf..1559512d71 100644
--- a/source/blender/editors/CMakeLists.txt
+++ b/source/blender/editors/CMakeLists.txt
@@ -47,7 +47,6 @@ if(WITH_BLENDER)
add_subdirectory(space_graph)
add_subdirectory(space_image)
add_subdirectory(space_info)
- add_subdirectory(space_collections)
add_subdirectory(space_logic)
add_subdirectory(space_nla)
add_subdirectory(space_node)
diff --git a/source/blender/editors/include/BIF_glutil.h
b/source/blender/editors/include/BIF_glutil.h
index 0355925f83..35e9f35b4e 100644
--- a/source/blender/editors/include/BIF_glutil.h
+++ b/source/blender/editors/include/BIF_glutil.h
@@ -49,7 +49,6 @@ struct ColorManagedDisplaySettings;
void fdrawline(float x1, float y1, float x2, float y2); /* DEPRECATED */
void fdrawbox(float x1, float y1, float x2, float y2); /* DEPRECATED */
-void fdrawbox_filled(float x1, float y1, float x2, float y2);
void sdrawline(int x1, int y1, int x2, int y2); /* DEPRECATED */
void sdrawbox(int x1, int y1, int x2, int y2); /* DEPRECATED */
diff --git a/source/blender/editors/include/ED_object.h
b/source/blender/editors/include/ED_object.h
index 4d79a42e64..f621ee7989 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -55,7 +55,6 @@ struct wmOperatorType;
struct PointerRNA;
struct PropertyRNA;
struct EnumPropertyItem;
-struct LayerTree;
/* object_edit.c */
struct Object *ED_object_context(struct bContext *C)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
