2011-02-23 10:52:22 +00:00
|
|
|
/*
|
2008-11-14 17:05:25 +00:00
|
|
|
* 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
|
2018-06-01 18:19:39 +02:00
|
|
|
* of the License, or (at your option) any later version.
|
2008-11-14 17:05:25 +00:00
|
|
|
*
|
|
|
|
|
* 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,
|
2010-02-12 13:34:04 +00:00
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2008-11-14 17:05:25 +00:00
|
|
|
*
|
|
|
|
|
* The Original Code is Copyright (C) 2008 Blender Foundation.
|
|
|
|
|
* All rights reserved.
|
|
|
|
|
*/
|
|
|
|
|
|
2019-02-18 08:08:12 +11:00
|
|
|
/** \file
|
|
|
|
|
* \ingroup spoutliner
|
2011-02-27 20:29:51 +00:00
|
|
|
*/
|
|
|
|
|
|
2008-11-14 17:05:25 +00:00
|
|
|
#include <stdio.h>
|
2020-03-19 09:33:03 +01:00
|
|
|
#include <string.h>
|
2008-11-14 17:05:25 +00:00
|
|
|
|
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
|
|
|
|
|
#include "BLI_blenlib.h"
|
2013-08-03 11:35:09 +00:00
|
|
|
#include "BLI_mempool.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "BLI_utildefines.h"
|
2008-11-14 17:05:25 +00:00
|
|
|
|
2008-12-18 02:56:48 +00:00
|
|
|
#include "BKE_context.h"
|
2017-11-08 12:16:49 -02:00
|
|
|
#include "BKE_layer.h"
|
2015-04-07 11:01:47 +10:00
|
|
|
#include "BKE_outliner_treehash.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "BKE_scene.h"
|
|
|
|
|
#include "BKE_screen.h"
|
2008-11-14 17:05:25 +00:00
|
|
|
|
2008-12-08 15:02:57 +00:00
|
|
|
#include "ED_screen.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "ED_space_api.h"
|
2008-11-14 17:05:25 +00:00
|
|
|
|
|
|
|
|
#include "WM_api.h"
|
2017-12-15 15:46:42 +01:00
|
|
|
#include "WM_message.h"
|
2008-11-14 17:05:25 +00:00
|
|
|
#include "WM_types.h"
|
|
|
|
|
|
2012-01-22 10:20:30 +00:00
|
|
|
#include "RNA_access.h"
|
|
|
|
|
|
2012-05-29 18:12:13 +00:00
|
|
|
#include "DNA_object_types.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "DNA_scene_types.h"
|
2012-05-29 18:12:13 +00:00
|
|
|
|
2008-11-14 17:05:25 +00:00
|
|
|
#include "UI_resources.h"
|
|
|
|
|
#include "UI_view2d.h"
|
|
|
|
|
|
2018-06-27 19:07:23 -06:00
|
|
|
#include "GPU_framebuffer.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "outliner_intern.h"
|
2020-11-14 14:09:53 -07:00
|
|
|
#include "tree/tree_display.h"
|
2008-11-14 17:05:25 +00:00
|
|
|
|
2020-03-06 16:56:42 +01:00
|
|
|
static void outliner_main_region_init(wmWindowManager *wm, ARegion *region)
|
2008-12-10 13:56:54 +00:00
|
|
|
{
|
2012-01-22 10:20:30 +00:00
|
|
|
ListBase *lb;
|
2009-09-17 21:36:02 +00:00
|
|
|
wmKeyMap *keymap;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-12-26 13:05:39 +00:00
|
|
|
/* make sure we keep the hide flags */
|
2020-03-06 16:56:42 +01:00
|
|
|
region->v2d.scroll |= (V2D_SCROLL_RIGHT | V2D_SCROLL_BOTTOM);
|
|
|
|
|
region->v2d.scroll &= ~(V2D_SCROLL_LEFT | V2D_SCROLL_TOP); /* prevent any noise of past */
|
|
|
|
|
region->v2d.scroll |= V2D_SCROLL_HORIZONTAL_HIDE;
|
|
|
|
|
region->v2d.scroll |= V2D_SCROLL_VERTICAL_HIDE;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-03-06 16:56:42 +01:00
|
|
|
region->v2d.align = (V2D_ALIGN_NO_NEG_X | V2D_ALIGN_NO_POS_Y);
|
|
|
|
|
region->v2d.keepzoom = (V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y | V2D_LIMITZOOM | V2D_KEEPASPECT);
|
|
|
|
|
region->v2d.keeptot = V2D_KEEPTOT_STRICT;
|
|
|
|
|
region->v2d.minzoom = region->v2d.maxzoom = 1.0f;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-03-06 16:56:42 +01:00
|
|
|
UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_LIST, region->winx, region->winy);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2008-12-22 19:31:23 +00:00
|
|
|
/* own keymap */
|
2018-08-31 13:36:14 +10:00
|
|
|
keymap = WM_keymap_ensure(wm->defaultconf, "Outliner", SPACE_OUTLINER, 0);
|
2020-03-06 16:56:42 +01:00
|
|
|
WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-01-22 10:20:30 +00:00
|
|
|
/* Add dropboxes */
|
|
|
|
|
lb = WM_dropboxmap_find("Outliner", SPACE_OUTLINER, RGN_TYPE_WINDOW);
|
2020-03-06 16:56:42 +01:00
|
|
|
WM_event_add_dropbox_handler(®ion->handlers, lb);
|
2012-01-22 10:20:30 +00:00
|
|
|
}
|
|
|
|
|
|
2020-03-06 16:56:42 +01:00
|
|
|
static void outliner_main_region_draw(const bContext *C, ARegion *region)
|
2008-12-22 19:31:23 +00:00
|
|
|
{
|
2020-03-06 16:56:42 +01:00
|
|
|
View2D *v2d = ®ion->v2d;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-12-22 19:31:23 +00:00
|
|
|
/* clear */
|
2010-04-06 07:02:16 +00:00
|
|
|
UI_ThemeClearColor(TH_BACK);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-12-22 19:31:23 +00:00
|
|
|
draw_outliner(C);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-12-22 19:31:23 +00:00
|
|
|
/* reset view matrix */
|
|
|
|
|
UI_view2d_view_restore(C);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-12-22 19:31:23 +00:00
|
|
|
/* scrollers */
|
2020-06-22 21:44:18 +02:00
|
|
|
UI_view2d_scrollers_draw(v2d, NULL);
|
2008-12-22 19:31:23 +00:00
|
|
|
}
|
|
|
|
|
|
2020-03-06 16:56:42 +01:00
|
|
|
static void outliner_main_region_free(ARegion *UNUSED(region))
|
2008-11-14 17:05:25 +00:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-19 12:59:00 +11:00
|
|
|
static void outliner_main_region_listener(const wmRegionListenerParams *params)
|
2008-12-29 12:15:42 +00:00
|
|
|
{
|
2021-01-18 17:28:47 -06:00
|
|
|
ScrArea *area = params->area;
|
|
|
|
|
ARegion *region = params->region;
|
|
|
|
|
wmNotifier *wmn = params->notifier;
|
2020-10-12 18:04:52 +02:00
|
|
|
SpaceOutliner *space_outliner = area->spacedata.first;
|
|
|
|
|
|
2008-12-29 12:15:42 +00:00
|
|
|
/* context changes */
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (wmn->category) {
|
2020-12-27 22:15:20 +01:00
|
|
|
case NC_WM:
|
|
|
|
|
switch (wmn->data) {
|
|
|
|
|
case ND_LIB_OVERRIDE_CHANGED:
|
|
|
|
|
ED_region_tag_redraw(region);
|
|
|
|
|
break;
|
|
|
|
|
}
|
2020-12-28 09:57:59 +01:00
|
|
|
break;
|
2008-12-29 12:15:42 +00:00
|
|
|
case NC_SCENE:
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (wmn->data) {
|
2008-12-29 12:15:42 +00:00
|
|
|
case ND_OB_ACTIVE:
|
|
|
|
|
case ND_OB_SELECT:
|
2020-10-12 18:04:52 +02:00
|
|
|
if (outliner_requires_rebuild_on_select_or_active_change(space_outliner)) {
|
|
|
|
|
ED_region_tag_redraw(region);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
ED_region_tag_redraw_no_rebuild(region);
|
|
|
|
|
}
|
2020-08-20 20:17:00 +02:00
|
|
|
break;
|
2010-09-27 21:22:20 +00:00
|
|
|
case ND_OB_VISIBLE:
|
|
|
|
|
case ND_OB_RENDER:
|
2009-01-01 13:15:35 +00:00
|
|
|
case ND_MODE:
|
2009-02-12 01:11:29 +00:00
|
|
|
case ND_KEYINGSET:
|
2009-04-09 07:26:49 +00:00
|
|
|
case ND_FRAME:
|
2009-07-25 13:40:59 +00:00
|
|
|
case ND_RENDER_OPTIONS:
|
2016-10-16 14:39:06 +02:00
|
|
|
case ND_SEQUENCER:
|
2017-03-01 19:56:37 +01:00
|
|
|
case ND_LAYER_CONTENT:
|
2010-10-13 01:10:56 +00:00
|
|
|
case ND_WORLD:
|
2018-04-24 15:20:17 +02:00
|
|
|
case ND_SCENEBROWSE:
|
2020-08-20 20:17:00 +02:00
|
|
|
ED_region_tag_redraw(region);
|
|
|
|
|
break;
|
|
|
|
|
case ND_LAYER:
|
|
|
|
|
/* Avoid rebuild if only the active collection changes */
|
|
|
|
|
if ((wmn->subtype == NS_LAYER_COLLECTION) && (wmn->action == NA_ACTIVATED)) {
|
|
|
|
|
ED_region_tag_redraw_no_rebuild(region);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-06 16:56:42 +01:00
|
|
|
ED_region_tag_redraw(region);
|
2008-12-29 12:15:42 +00:00
|
|
|
break;
|
|
|
|
|
}
|
2020-08-20 20:17:00 +02:00
|
|
|
if (wmn->action == NA_EDITED) {
|
|
|
|
|
ED_region_tag_redraw_no_rebuild(region);
|
2019-08-09 13:47:53 -06:00
|
|
|
}
|
2008-12-29 12:15:42 +00:00
|
|
|
break;
|
|
|
|
|
case NC_OBJECT:
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (wmn->data) {
|
2010-01-25 19:42:33 +00:00
|
|
|
case ND_TRANSFORM:
|
2008-12-29 12:15:42 +00:00
|
|
|
case ND_BONE_ACTIVE:
|
|
|
|
|
case ND_BONE_SELECT:
|
2011-01-21 08:59:08 +00:00
|
|
|
case ND_DRAW:
|
2010-09-18 08:37:47 +00:00
|
|
|
case ND_PARENT:
|
2010-10-05 11:55:54 +00:00
|
|
|
case ND_OB_SHADING:
|
2020-03-06 16:56:42 +01:00
|
|
|
ED_region_tag_redraw(region);
|
2008-12-29 12:15:42 +00:00
|
|
|
break;
|
2010-09-18 08:37:47 +00:00
|
|
|
case ND_CONSTRAINT:
|
2019-08-08 13:58:53 -06:00
|
|
|
/* all constraint actions now, for reordering */
|
2020-03-06 16:56:42 +01:00
|
|
|
ED_region_tag_redraw(region);
|
2010-09-18 08:37:47 +00:00
|
|
|
break;
|
2009-12-13 23:51:41 +00:00
|
|
|
case ND_MODIFIER:
|
2010-09-18 08:37:47 +00:00
|
|
|
/* all modifier actions now */
|
2020-03-06 16:56:42 +01:00
|
|
|
ED_region_tag_redraw(region);
|
2009-12-13 23:51:41 +00:00
|
|
|
break;
|
2013-03-11 19:50:11 +00:00
|
|
|
default:
|
|
|
|
|
/* Trigger update for NC_OBJECT itself */
|
2020-03-06 16:56:42 +01:00
|
|
|
ED_region_tag_redraw(region);
|
2013-03-11 19:50:11 +00:00
|
|
|
break;
|
2008-12-29 12:15:42 +00:00
|
|
|
}
|
2010-09-17 06:52:48 +00:00
|
|
|
break;
|
2009-01-20 11:09:26 +00:00
|
|
|
case NC_GROUP:
|
|
|
|
|
/* all actions now, todo: check outliner view mode? */
|
2020-03-06 16:56:42 +01:00
|
|
|
ED_region_tag_redraw(region);
|
2009-01-20 11:09:26 +00:00
|
|
|
break;
|
2009-10-02 15:27:26 +00:00
|
|
|
case NC_LAMP:
|
2019-02-27 12:02:02 +11:00
|
|
|
/* For updating light icons, when changing light type */
|
2019-03-26 21:16:47 +11:00
|
|
|
if (wmn->data == ND_LIGHTING_DRAW) {
|
2020-03-06 16:56:42 +01:00
|
|
|
ED_region_tag_redraw(region);
|
2019-03-26 21:16:47 +11:00
|
|
|
}
|
2012-05-07 17:56:30 +00:00
|
|
|
break;
|
2.5
Notifiers
---------
Various fixes for wrong use of notifiers, and some new notifiers
to make things a bit more clear and consistent, with two notable
changes:
* Geometry changes are now done with NC_GEOM, rather than
NC_OBJECT|ND_GEOM_, so an object does need to be available.
* Space data now use NC_SPACE|ND_SPACE_*, instead of data
notifiers or even NC_WINDOW in some cases. Note that NC_SPACE
should only be used for notifying about changes in space data,
we don't want to go back to allqueue(REDRAW..).
Depsgraph
---------
The dependency graph now has a different flush call:
DAG_object_flush_update(scene, ob, flag)
is replaced by:
DAG_id_flush_update(id, flag)
It still works basically the same, one difference is that it now
also accepts object data (e.g. Mesh), again to avoid requiring an
Object to be available. Other ID types will simply do nothing at
the moment.
Docs
----
I made some guidelines for how/when to do which kinds of updates
and notifiers. I can't specify totally exact how to make these
decisions, but these are basically the guidelines I use. So, new
and updated docs are here:
http://wiki.blender.org/index.php/BlenderDev/Blender2.5/NotifiersUpdates
http://wiki.blender.org/index.php/BlenderDev/Blender2.5/DataNotifiers
2009-09-04 20:51:09 +00:00
|
|
|
case NC_SPACE:
|
2019-03-26 21:16:47 +11:00
|
|
|
if (wmn->data == ND_SPACE_OUTLINER) {
|
2020-03-06 16:56:42 +01:00
|
|
|
ED_region_tag_redraw(region);
|
2019-03-26 21:16:47 +11:00
|
|
|
}
|
2012-05-07 17:56:30 +00:00
|
|
|
break;
|
2009-11-25 23:13:47 +00:00
|
|
|
case NC_ID:
|
2021-01-07 14:06:43 +01:00
|
|
|
if (ELEM(wmn->action, NA_RENAME, NA_ADDED)) {
|
2020-03-06 16:56:42 +01:00
|
|
|
ED_region_tag_redraw(region);
|
2019-03-26 21:16:47 +11:00
|
|
|
}
|
2009-12-13 23:51:41 +00:00
|
|
|
break;
|
2010-10-05 11:55:54 +00:00
|
|
|
case NC_MATERIAL:
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (wmn->data) {
|
2012-11-26 08:52:07 +00:00
|
|
|
case ND_SHADING_LINKS:
|
2020-08-20 20:17:00 +02:00
|
|
|
ED_region_tag_redraw_no_rebuild(region);
|
2010-10-05 11:55:54 +00:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2010-10-14 09:24:25 +00:00
|
|
|
case NC_GEOM:
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (wmn->data) {
|
2012-11-25 06:55:39 +00:00
|
|
|
case ND_VERTEX_GROUP:
|
2014-05-19 22:37:35 +02:00
|
|
|
case ND_DATA:
|
2020-03-06 16:56:42 +01:00
|
|
|
ED_region_tag_redraw(region);
|
2010-10-14 09:24:25 +00:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2011-07-07 03:35:48 +00:00
|
|
|
case NC_ANIMATION:
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (wmn->data) {
|
2011-07-07 03:35:48 +00:00
|
|
|
case ND_NLA_ACTCHANGE:
|
2012-02-12 18:57:05 +00:00
|
|
|
case ND_KEYFRAME:
|
2020-03-06 16:56:42 +01:00
|
|
|
ED_region_tag_redraw(region);
|
2011-07-07 03:35:48 +00:00
|
|
|
break;
|
2011-09-28 16:13:36 +00:00
|
|
|
case ND_ANIMCHAN:
|
2021-01-11 13:56:15 +01:00
|
|
|
if (ELEM(wmn->action, NA_SELECTED, NA_RENAME)) {
|
2020-03-06 16:56:42 +01:00
|
|
|
ED_region_tag_redraw(region);
|
2019-03-26 21:16:47 +11:00
|
|
|
}
|
2011-09-28 16:13:36 +00:00
|
|
|
break;
|
2021-01-11 13:56:15 +01:00
|
|
|
case ND_NLA:
|
|
|
|
|
if (ELEM(wmn->action, NA_ADDED, NA_REMOVED)) {
|
|
|
|
|
ED_region_tag_redraw(region);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case ND_NLA_ORDER:
|
|
|
|
|
ED_region_tag_redraw(region);
|
|
|
|
|
break;
|
2011-07-07 03:35:48 +00:00
|
|
|
}
|
|
|
|
|
break;
|
2015-02-09 12:34:17 +13:00
|
|
|
case NC_GPENCIL:
|
2019-03-26 21:16:47 +11:00
|
|
|
if (ELEM(wmn->action, NA_EDITED, NA_SELECTED)) {
|
2020-03-06 16:56:42 +01:00
|
|
|
ED_region_tag_redraw(region);
|
2019-03-26 21:16:47 +11:00
|
|
|
}
|
2015-02-09 12:34:17 +13:00
|
|
|
break;
|
Main Workspace Integration
This commit does the main integration of workspaces, which is a design we agreed on during the 2.8 UI workshop (see https://wiki.blender.org/index.php/Dev:2.8/UI/Workshop_Writeup)
Workspaces should generally be stable, I'm not aware of any remaining bugs (or I've forgotten them :) ). If you find any, let me know!
(Exception: mode switching button might get out of sync with actual mode in some cases, would consider that a limitation/ToDo. Needs to be resolved at some point.)
== Main Changes/Features
* Introduces the new Workspaces as data-blocks.
* Allow storing a number of custom workspaces as part of the user configuration. Needs further work to allow adding and deleting individual workspaces.
* Bundle a default workspace configuration with Blender (current screen-layouts converted to workspaces).
* Pressing button to add a workspace spawns a menu to select between "Duplicate Current" and the workspaces from the user configuration. If no workspaces are stored in the user configuration, the default workspaces are listed instead.
* Store screen-layouts (`bScreen`) per workspace.
* Store an active screen-layout per workspace. Changing the workspace will enable this layout.
* Store active mode in workspace. Changing the workspace will also enter the mode of the new workspace. (Note that we still store the active mode in the object, moving this completely to workspaces is a separate project.)
* Store an active render layer per workspace.
* Moved mode switch from 3D View header to Info Editor header.
* Store active scene in window (not directly workspace related, but overlaps quite a bit).
* Removed 'Use Global Scene' User Preference option.
* Compatibility with old files - a new workspace is created for every screen-layout of old files. Old Blender versions should be able to read files saved with workspace support as well.
* Default .blend only contains one workspace ("General").
* Support appending workspaces.
Opening files without UI and commandline rendering should work fine.
Note that the UI is temporary! We plan to introduce a new global topbar
that contains the workspace options and tabs for switching workspaces.
== Technical Notes
* Workspaces are data-blocks.
* Adding and removing `bScreen`s should be done through `ED_workspace_layout` API now.
* A workspace can be active in multiple windows at the same time.
* The mode menu (which is now in the Info Editor header) doesn't display "Grease Pencil Edit" mode anymore since its availability depends on the active editor. Will be fixed by making Grease Pencil an own object type (as planned).
* The button to change the active workspace object mode may get out of sync with the mode of the active object. Will either be resolved by moving mode out of object data, or we'll disable workspace modes again (there's a `#define USE_WORKSPACE_MODE` for that).
* Screen-layouts (`bScreen`) are IDs and thus stored in a main list-base. Had to add a wrapper `WorkSpaceLayout` so we can store them in a list-base within workspaces, too. On the long run we could completely replace `bScreen` by workspace structs.
* `WorkSpace` types use some special compiler trickery to allow marking structs and struct members as private. BKE_workspace API should be used for accessing those.
* Added scene operators `SCENE_OT_`. Was previously done through screen operators.
== BPY API Changes
* Removed `Screen.scene`, added `Window.scene`
* Removed `UserPreferencesView.use_global_scene`
* Added `Context.workspace`, `Window.workspace` and `BlendData.workspaces`
* Added `bpy.types.WorkSpace` containing `screens`, `object_mode` and `render_layer`
* Added Screen.layout_name for the layout name that'll be displayed in the UI (may differ from internal name)
== What's left?
* There are a few open design questions (T50521). We should find the needed answers and implement them.
* Allow adding and removing individual workspaces from workspace configuration (needs UI design).
* Get the override system ready and support overrides per workspace.
* Support custom UI setups as part of workspaces (hidden panels, hidden buttons, customizable toolbars, etc).
* Allow enabling add-ons per workspace.
* Support custom workspace keymaps.
* Remove special exception for workspaces in linking code (so they're always appended, never linked). Depends on a few things, so best to solve later.
* Get the topbar done.
* Workspaces need a proper icon, current one is just a placeholder :)
Reviewed By: campbellbarton, mont29
Tags: #user_interface, #bf_blender_2.8
Maniphest Tasks: T50521
Differential Revision: https://developer.blender.org/D2451
2017-06-01 19:56:58 +02:00
|
|
|
case NC_SCREEN:
|
2020-06-19 19:55:17 +02:00
|
|
|
if (ELEM(wmn->data, ND_LAYOUTDELETE, ND_LAYER)) {
|
2020-03-06 16:56:42 +01:00
|
|
|
ED_region_tag_redraw(region);
|
Main Workspace Integration
This commit does the main integration of workspaces, which is a design we agreed on during the 2.8 UI workshop (see https://wiki.blender.org/index.php/Dev:2.8/UI/Workshop_Writeup)
Workspaces should generally be stable, I'm not aware of any remaining bugs (or I've forgotten them :) ). If you find any, let me know!
(Exception: mode switching button might get out of sync with actual mode in some cases, would consider that a limitation/ToDo. Needs to be resolved at some point.)
== Main Changes/Features
* Introduces the new Workspaces as data-blocks.
* Allow storing a number of custom workspaces as part of the user configuration. Needs further work to allow adding and deleting individual workspaces.
* Bundle a default workspace configuration with Blender (current screen-layouts converted to workspaces).
* Pressing button to add a workspace spawns a menu to select between "Duplicate Current" and the workspaces from the user configuration. If no workspaces are stored in the user configuration, the default workspaces are listed instead.
* Store screen-layouts (`bScreen`) per workspace.
* Store an active screen-layout per workspace. Changing the workspace will enable this layout.
* Store active mode in workspace. Changing the workspace will also enter the mode of the new workspace. (Note that we still store the active mode in the object, moving this completely to workspaces is a separate project.)
* Store an active render layer per workspace.
* Moved mode switch from 3D View header to Info Editor header.
* Store active scene in window (not directly workspace related, but overlaps quite a bit).
* Removed 'Use Global Scene' User Preference option.
* Compatibility with old files - a new workspace is created for every screen-layout of old files. Old Blender versions should be able to read files saved with workspace support as well.
* Default .blend only contains one workspace ("General").
* Support appending workspaces.
Opening files without UI and commandline rendering should work fine.
Note that the UI is temporary! We plan to introduce a new global topbar
that contains the workspace options and tabs for switching workspaces.
== Technical Notes
* Workspaces are data-blocks.
* Adding and removing `bScreen`s should be done through `ED_workspace_layout` API now.
* A workspace can be active in multiple windows at the same time.
* The mode menu (which is now in the Info Editor header) doesn't display "Grease Pencil Edit" mode anymore since its availability depends on the active editor. Will be fixed by making Grease Pencil an own object type (as planned).
* The button to change the active workspace object mode may get out of sync with the mode of the active object. Will either be resolved by moving mode out of object data, or we'll disable workspace modes again (there's a `#define USE_WORKSPACE_MODE` for that).
* Screen-layouts (`bScreen`) are IDs and thus stored in a main list-base. Had to add a wrapper `WorkSpaceLayout` so we can store them in a list-base within workspaces, too. On the long run we could completely replace `bScreen` by workspace structs.
* `WorkSpace` types use some special compiler trickery to allow marking structs and struct members as private. BKE_workspace API should be used for accessing those.
* Added scene operators `SCENE_OT_`. Was previously done through screen operators.
== BPY API Changes
* Removed `Screen.scene`, added `Window.scene`
* Removed `UserPreferencesView.use_global_scene`
* Added `Context.workspace`, `Window.workspace` and `BlendData.workspaces`
* Added `bpy.types.WorkSpace` containing `screens`, `object_mode` and `render_layer`
* Added Screen.layout_name for the layout name that'll be displayed in the UI (may differ from internal name)
== What's left?
* There are a few open design questions (T50521). We should find the needed answers and implement them.
* Allow adding and removing individual workspaces from workspace configuration (needs UI design).
* Get the override system ready and support overrides per workspace.
* Support custom UI setups as part of workspaces (hidden panels, hidden buttons, customizable toolbars, etc).
* Allow enabling add-ons per workspace.
* Support custom workspace keymaps.
* Remove special exception for workspaces in linking code (so they're always appended, never linked). Depends on a few things, so best to solve later.
* Get the topbar done.
* Workspaces need a proper icon, current one is just a placeholder :)
Reviewed By: campbellbarton, mont29
Tags: #user_interface, #bf_blender_2.8
Maniphest Tasks: T50521
Differential Revision: https://developer.blender.org/D2451
2017-06-01 19:56:58 +02:00
|
|
|
}
|
|
|
|
|
break;
|
2018-12-29 18:26:04 +01:00
|
|
|
case NC_MASK:
|
|
|
|
|
if (ELEM(wmn->action, NA_ADDED)) {
|
2020-03-06 16:56:42 +01:00
|
|
|
ED_region_tag_redraw(region);
|
2018-12-29 18:26:04 +01:00
|
|
|
}
|
|
|
|
|
break;
|
2019-03-04 11:51:11 +01:00
|
|
|
case NC_PAINTCURVE:
|
|
|
|
|
if (ELEM(wmn->action, NA_ADDED)) {
|
2020-03-06 16:56:42 +01:00
|
|
|
ED_region_tag_redraw(region);
|
2019-03-04 11:51:11 +01:00
|
|
|
}
|
|
|
|
|
break;
|
2019-09-19 08:47:39 -06:00
|
|
|
case NC_TEXT:
|
|
|
|
|
if (ELEM(wmn->action, NA_ADDED, NA_REMOVED)) {
|
2020-03-06 16:56:42 +01:00
|
|
|
ED_region_tag_redraw(region);
|
2019-09-19 08:47:39 -06:00
|
|
|
}
|
|
|
|
|
break;
|
2008-12-29 12:15:42 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-19 12:59:00 +11:00
|
|
|
static void outliner_main_region_message_subscribe(const wmRegionMessageSubscribeParams *params)
|
2017-12-15 15:46:42 +01:00
|
|
|
{
|
2021-01-18 17:28:47 -06:00
|
|
|
struct wmMsgBus *mbus = params->message_bus;
|
|
|
|
|
ScrArea *area = params->area;
|
|
|
|
|
ARegion *region = params->region;
|
2020-08-07 11:47:23 -06:00
|
|
|
SpaceOutliner *space_outliner = area->spacedata.first;
|
2021-01-18 17:28:47 -06:00
|
|
|
|
2017-12-15 15:46:42 +01:00
|
|
|
wmMsgSubscribeValue msg_sub_value_region_tag_redraw = {
|
2020-03-06 16:56:42 +01:00
|
|
|
.owner = region,
|
|
|
|
|
.user_data = region,
|
2017-12-15 15:46:42 +01:00
|
|
|
.notify = ED_region_do_msg_notify_tag_redraw,
|
|
|
|
|
};
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-08-07 11:47:23 -06:00
|
|
|
if (ELEM(space_outliner->outlinevis, SO_VIEW_LAYER, SO_SCENES)) {
|
2017-12-15 15:46:42 +01:00
|
|
|
WM_msg_subscribe_rna_anon_prop(mbus, Window, view_layer, &msg_sub_value_region_tag_redraw);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2008-11-14 17:05:25 +00:00
|
|
|
/* ************************ header outliner area region *********************** */
|
|
|
|
|
|
2008-12-15 13:23:55 +00:00
|
|
|
/* add handlers, stuff you only do once or on area/region changes */
|
2020-03-06 16:56:42 +01:00
|
|
|
static void outliner_header_region_init(wmWindowManager *UNUSED(wm), ARegion *region)
|
2008-12-15 13:23:55 +00:00
|
|
|
{
|
2020-03-06 16:56:42 +01:00
|
|
|
ED_region_header_init(region);
|
2008-12-15 13:23:55 +00:00
|
|
|
}
|
2008-12-10 13:56:54 +00:00
|
|
|
|
2020-03-06 16:56:42 +01:00
|
|
|
static void outliner_header_region_draw(const bContext *C, ARegion *region)
|
2008-11-14 17:05:25 +00:00
|
|
|
{
|
2020-03-06 16:56:42 +01:00
|
|
|
ED_region_header(C, region);
|
2008-11-14 17:05:25 +00:00
|
|
|
}
|
|
|
|
|
|
2020-03-06 16:56:42 +01:00
|
|
|
static void outliner_header_region_free(ARegion *UNUSED(region))
|
2008-11-14 17:05:25 +00:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-19 12:59:00 +11:00
|
|
|
static void outliner_header_region_listener(const wmRegionListenerParams *params)
|
2009-02-12 01:11:29 +00:00
|
|
|
{
|
2021-01-18 17:28:47 -06:00
|
|
|
ARegion *region = params->region;
|
|
|
|
|
wmNotifier *wmn = params->notifier;
|
|
|
|
|
|
2009-02-12 01:11:29 +00:00
|
|
|
/* context changes */
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (wmn->category) {
|
2009-02-12 01:11:29 +00:00
|
|
|
case NC_SCENE:
|
2019-03-26 21:16:47 +11:00
|
|
|
if (wmn->data == ND_KEYINGSET) {
|
2020-03-06 16:56:42 +01:00
|
|
|
ED_region_tag_redraw(region);
|
2019-03-26 21:16:47 +11:00
|
|
|
}
|
2009-02-12 01:11:29 +00:00
|
|
|
break;
|
2.5
Notifiers
---------
Various fixes for wrong use of notifiers, and some new notifiers
to make things a bit more clear and consistent, with two notable
changes:
* Geometry changes are now done with NC_GEOM, rather than
NC_OBJECT|ND_GEOM_, so an object does need to be available.
* Space data now use NC_SPACE|ND_SPACE_*, instead of data
notifiers or even NC_WINDOW in some cases. Note that NC_SPACE
should only be used for notifying about changes in space data,
we don't want to go back to allqueue(REDRAW..).
Depsgraph
---------
The dependency graph now has a different flush call:
DAG_object_flush_update(scene, ob, flag)
is replaced by:
DAG_id_flush_update(id, flag)
It still works basically the same, one difference is that it now
also accepts object data (e.g. Mesh), again to avoid requiring an
Object to be available. Other ID types will simply do nothing at
the moment.
Docs
----
I made some guidelines for how/when to do which kinds of updates
and notifiers. I can't specify totally exact how to make these
decisions, but these are basically the guidelines I use. So, new
and updated docs are here:
http://wiki.blender.org/index.php/BlenderDev/Blender2.5/NotifiersUpdates
http://wiki.blender.org/index.php/BlenderDev/Blender2.5/DataNotifiers
2009-09-04 20:51:09 +00:00
|
|
|
case NC_SPACE:
|
2019-03-26 21:16:47 +11:00
|
|
|
if (wmn->data == ND_SPACE_OUTLINER) {
|
2020-03-06 16:56:42 +01:00
|
|
|
ED_region_tag_redraw(region);
|
2019-03-26 21:16:47 +11:00
|
|
|
}
|
2.5
Notifiers
---------
Various fixes for wrong use of notifiers, and some new notifiers
to make things a bit more clear and consistent, with two notable
changes:
* Geometry changes are now done with NC_GEOM, rather than
NC_OBJECT|ND_GEOM_, so an object does need to be available.
* Space data now use NC_SPACE|ND_SPACE_*, instead of data
notifiers or even NC_WINDOW in some cases. Note that NC_SPACE
should only be used for notifying about changes in space data,
we don't want to go back to allqueue(REDRAW..).
Depsgraph
---------
The dependency graph now has a different flush call:
DAG_object_flush_update(scene, ob, flag)
is replaced by:
DAG_id_flush_update(id, flag)
It still works basically the same, one difference is that it now
also accepts object data (e.g. Mesh), again to avoid requiring an
Object to be available. Other ID types will simply do nothing at
the moment.
Docs
----
I made some guidelines for how/when to do which kinds of updates
and notifiers. I can't specify totally exact how to make these
decisions, but these are basically the guidelines I use. So, new
and updated docs are here:
http://wiki.blender.org/index.php/BlenderDev/Blender2.5/NotifiersUpdates
http://wiki.blender.org/index.php/BlenderDev/Blender2.5/DataNotifiers
2009-09-04 20:51:09 +00:00
|
|
|
break;
|
2009-02-12 01:11:29 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2008-11-14 17:05:25 +00:00
|
|
|
/* ******************** default callbacks for outliner space ***************** */
|
|
|
|
|
|
2020-08-04 14:39:53 +02:00
|
|
|
static SpaceLink *outliner_create(const ScrArea *UNUSED(area), const Scene *UNUSED(scene))
|
2008-11-14 17:05:25 +00:00
|
|
|
{
|
2020-03-06 16:56:42 +01:00
|
|
|
ARegion *region;
|
2020-08-07 11:47:23 -06:00
|
|
|
SpaceOutliner *space_outliner;
|
2008-11-14 17:05:25 +00:00
|
|
|
|
2020-08-07 11:47:23 -06:00
|
|
|
space_outliner = MEM_callocN(sizeof(SpaceOutliner), "initoutliner");
|
|
|
|
|
space_outliner->spacetype = SPACE_OUTLINER;
|
|
|
|
|
space_outliner->filter_id_type = ID_GR;
|
|
|
|
|
space_outliner->show_restrict_flags = SO_RESTRICT_ENABLE | SO_RESTRICT_HIDE;
|
|
|
|
|
space_outliner->outlinevis = SO_VIEW_LAYER;
|
|
|
|
|
space_outliner->sync_select_dirty |= WM_OUTLINER_SYNC_SELECT_FROM_ALL;
|
2020-09-10 08:35:58 -06:00
|
|
|
space_outliner->flag = SO_SYNC_SELECT | SO_MODE_COLUMN;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2008-12-12 16:29:33 +00:00
|
|
|
/* header */
|
2020-03-06 16:56:42 +01:00
|
|
|
region = MEM_callocN(sizeof(ARegion), "header for outliner");
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2020-08-07 11:47:23 -06:00
|
|
|
BLI_addtail(&space_outliner->regionbase, region);
|
2020-03-06 16:56:42 +01:00
|
|
|
region->regiontype = RGN_TYPE_HEADER;
|
|
|
|
|
region->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2015-11-28 17:14:45 +01:00
|
|
|
/* main region */
|
2020-03-06 16:56:42 +01:00
|
|
|
region = MEM_callocN(sizeof(ARegion), "main region for outliner");
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2020-08-07 11:47:23 -06:00
|
|
|
BLI_addtail(&space_outliner->regionbase, region);
|
2020-03-06 16:56:42 +01:00
|
|
|
region->regiontype = RGN_TYPE_WINDOW;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2020-08-07 11:47:23 -06:00
|
|
|
return (SpaceLink *)space_outliner;
|
2008-11-14 17:05:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* not spacelink itself */
|
|
|
|
|
static void outliner_free(SpaceLink *sl)
|
|
|
|
|
{
|
2020-08-07 11:47:23 -06:00
|
|
|
SpaceOutliner *space_outliner = (SpaceOutliner *)sl;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-08-07 11:47:23 -06:00
|
|
|
outliner_free_tree(&space_outliner->tree);
|
|
|
|
|
if (space_outliner->treestore) {
|
|
|
|
|
BLI_mempool_destroy(space_outliner->treestore);
|
2013-08-03 11:35:09 +00:00
|
|
|
}
|
UI Code Quality: Start refactoring Outliner tree building (using C++)
This introduces a new C++ abstraction "tree-display" (in this commit named
tree-view, renamed in a followup) to help constructing and managing the tree
for the different display types (View Layer, Scene, Blender file, etc.).
See https://developer.blender.org/D9499 for more context. Other developers
approved this rather significantly different design approach there.
----
Motivation
General problems with current design:
* The Outliner tree building code is messy and hard to follow.
* Hard-coded display mode checks are scattered over many places.
* Data is passed around in rather unsafe ways (e.g. lots of `void *`).
* There are no individually testable units.
* Data-structure use is inefficient.
The current Outliner code needs quite some untangling, the tree building seems
like a good place to start. This and the followup commits tackle that.
----
Design Idea
Idea is to have an abstract base class (`AbstractTreeDisplay`), and then
sub-classes with the implementation for each display type (e.g.
`TreeDisplayViewLayer`, `TreeDisplayDataAPI`, etc). The tree-display is kept
alive until tree-rebuild as runtime data of the space, so that further queries
based on the display type can be executed (e.g. "does the display support
selection syncing?", "does it support restriction toggle columns?", etc.).
New files are in a new `space_outliner/tree` sub-directory.
With the new design, display modes become proper units, making them more
maintainable, safer and testable. It should also be easier now to add new
display modes.
2020-11-06 20:54:20 +01:00
|
|
|
|
|
|
|
|
if (space_outliner->runtime) {
|
2020-11-14 14:09:53 -07:00
|
|
|
outliner_tree_display_destroy(&space_outliner->runtime->tree_display);
|
2020-12-04 19:43:33 +01:00
|
|
|
if (space_outliner->runtime->treehash) {
|
|
|
|
|
BKE_outliner_treehash_free(space_outliner->runtime->treehash);
|
|
|
|
|
}
|
UI Code Quality: Start refactoring Outliner tree building (using C++)
This introduces a new C++ abstraction "tree-display" (in this commit named
tree-view, renamed in a followup) to help constructing and managing the tree
for the different display types (View Layer, Scene, Blender file, etc.).
See https://developer.blender.org/D9499 for more context. Other developers
approved this rather significantly different design approach there.
----
Motivation
General problems with current design:
* The Outliner tree building code is messy and hard to follow.
* Hard-coded display mode checks are scattered over many places.
* Data is passed around in rather unsafe ways (e.g. lots of `void *`).
* There are no individually testable units.
* Data-structure use is inefficient.
The current Outliner code needs quite some untangling, the tree building seems
like a good place to start. This and the followup commits tackle that.
----
Design Idea
Idea is to have an abstract base class (`AbstractTreeDisplay`), and then
sub-classes with the implementation for each display type (e.g.
`TreeDisplayViewLayer`, `TreeDisplayDataAPI`, etc). The tree-display is kept
alive until tree-rebuild as runtime data of the space, so that further queries
based on the display type can be executed (e.g. "does the display support
selection syncing?", "does it support restriction toggle columns?", etc.).
New files are in a new `space_outliner/tree` sub-directory.
With the new design, display modes become proper units, making them more
maintainable, safer and testable. It should also be easier now to add new
display modes.
2020-11-06 20:54:20 +01:00
|
|
|
MEM_freeN(space_outliner->runtime);
|
|
|
|
|
}
|
2008-11-14 17:05:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* spacetype; init callback */
|
UI Code Quality: Start refactoring Outliner tree building (using C++)
This introduces a new C++ abstraction "tree-display" (in this commit named
tree-view, renamed in a followup) to help constructing and managing the tree
for the different display types (View Layer, Scene, Blender file, etc.).
See https://developer.blender.org/D9499 for more context. Other developers
approved this rather significantly different design approach there.
----
Motivation
General problems with current design:
* The Outliner tree building code is messy and hard to follow.
* Hard-coded display mode checks are scattered over many places.
* Data is passed around in rather unsafe ways (e.g. lots of `void *`).
* There are no individually testable units.
* Data-structure use is inefficient.
The current Outliner code needs quite some untangling, the tree building seems
like a good place to start. This and the followup commits tackle that.
----
Design Idea
Idea is to have an abstract base class (`AbstractTreeDisplay`), and then
sub-classes with the implementation for each display type (e.g.
`TreeDisplayViewLayer`, `TreeDisplayDataAPI`, etc). The tree-display is kept
alive until tree-rebuild as runtime data of the space, so that further queries
based on the display type can be executed (e.g. "does the display support
selection syncing?", "does it support restriction toggle columns?", etc.).
New files are in a new `space_outliner/tree` sub-directory.
With the new design, display modes become proper units, making them more
maintainable, safer and testable. It should also be easier now to add new
display modes.
2020-11-06 20:54:20 +01:00
|
|
|
static void outliner_init(wmWindowManager *UNUSED(wm), ScrArea *area)
|
2008-11-14 17:05:25 +00:00
|
|
|
{
|
UI Code Quality: Start refactoring Outliner tree building (using C++)
This introduces a new C++ abstraction "tree-display" (in this commit named
tree-view, renamed in a followup) to help constructing and managing the tree
for the different display types (View Layer, Scene, Blender file, etc.).
See https://developer.blender.org/D9499 for more context. Other developers
approved this rather significantly different design approach there.
----
Motivation
General problems with current design:
* The Outliner tree building code is messy and hard to follow.
* Hard-coded display mode checks are scattered over many places.
* Data is passed around in rather unsafe ways (e.g. lots of `void *`).
* There are no individually testable units.
* Data-structure use is inefficient.
The current Outliner code needs quite some untangling, the tree building seems
like a good place to start. This and the followup commits tackle that.
----
Design Idea
Idea is to have an abstract base class (`AbstractTreeDisplay`), and then
sub-classes with the implementation for each display type (e.g.
`TreeDisplayViewLayer`, `TreeDisplayDataAPI`, etc). The tree-display is kept
alive until tree-rebuild as runtime data of the space, so that further queries
based on the display type can be executed (e.g. "does the display support
selection syncing?", "does it support restriction toggle columns?", etc.).
New files are in a new `space_outliner/tree` sub-directory.
With the new design, display modes become proper units, making them more
maintainable, safer and testable. It should also be easier now to add new
display modes.
2020-11-06 20:54:20 +01:00
|
|
|
SpaceOutliner *space_outliner = area->spacedata.first;
|
|
|
|
|
|
|
|
|
|
if (space_outliner->runtime == NULL) {
|
|
|
|
|
space_outliner->runtime = MEM_callocN(sizeof(*space_outliner->runtime),
|
|
|
|
|
"SpaceOutliner_Runtime");
|
|
|
|
|
}
|
2008-11-14 17:05:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static SpaceLink *outliner_duplicate(SpaceLink *sl)
|
|
|
|
|
{
|
2020-08-07 11:47:23 -06:00
|
|
|
SpaceOutliner *space_outliner = (SpaceOutliner *)sl;
|
|
|
|
|
SpaceOutliner *space_outliner_new = MEM_dupallocN(space_outliner);
|
2008-11-21 19:14:38 +00:00
|
|
|
|
2020-08-07 11:47:23 -06:00
|
|
|
BLI_listbase_clear(&space_outliner_new->tree);
|
|
|
|
|
space_outliner_new->treestore = NULL;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2020-08-07 11:47:23 -06:00
|
|
|
space_outliner_new->sync_select_dirty = WM_OUTLINER_SYNC_SELECT_FROM_ALL;
|
2019-08-07 22:27:07 -06:00
|
|
|
|
UI Code Quality: Start refactoring Outliner tree building (using C++)
This introduces a new C++ abstraction "tree-display" (in this commit named
tree-view, renamed in a followup) to help constructing and managing the tree
for the different display types (View Layer, Scene, Blender file, etc.).
See https://developer.blender.org/D9499 for more context. Other developers
approved this rather significantly different design approach there.
----
Motivation
General problems with current design:
* The Outliner tree building code is messy and hard to follow.
* Hard-coded display mode checks are scattered over many places.
* Data is passed around in rather unsafe ways (e.g. lots of `void *`).
* There are no individually testable units.
* Data-structure use is inefficient.
The current Outliner code needs quite some untangling, the tree building seems
like a good place to start. This and the followup commits tackle that.
----
Design Idea
Idea is to have an abstract base class (`AbstractTreeDisplay`), and then
sub-classes with the implementation for each display type (e.g.
`TreeDisplayViewLayer`, `TreeDisplayDataAPI`, etc). The tree-display is kept
alive until tree-rebuild as runtime data of the space, so that further queries
based on the display type can be executed (e.g. "does the display support
selection syncing?", "does it support restriction toggle columns?", etc.).
New files are in a new `space_outliner/tree` sub-directory.
With the new design, display modes become proper units, making them more
maintainable, safer and testable. It should also be easier now to add new
display modes.
2020-11-06 20:54:20 +01:00
|
|
|
if (space_outliner->runtime) {
|
|
|
|
|
space_outliner_new->runtime = MEM_dupallocN(space_outliner->runtime);
|
2020-11-14 14:09:53 -07:00
|
|
|
space_outliner_new->runtime->tree_display = NULL;
|
2020-12-04 19:43:33 +01:00
|
|
|
space_outliner_new->runtime->treehash = NULL;
|
UI Code Quality: Start refactoring Outliner tree building (using C++)
This introduces a new C++ abstraction "tree-display" (in this commit named
tree-view, renamed in a followup) to help constructing and managing the tree
for the different display types (View Layer, Scene, Blender file, etc.).
See https://developer.blender.org/D9499 for more context. Other developers
approved this rather significantly different design approach there.
----
Motivation
General problems with current design:
* The Outliner tree building code is messy and hard to follow.
* Hard-coded display mode checks are scattered over many places.
* Data is passed around in rather unsafe ways (e.g. lots of `void *`).
* There are no individually testable units.
* Data-structure use is inefficient.
The current Outliner code needs quite some untangling, the tree building seems
like a good place to start. This and the followup commits tackle that.
----
Design Idea
Idea is to have an abstract base class (`AbstractTreeDisplay`), and then
sub-classes with the implementation for each display type (e.g.
`TreeDisplayViewLayer`, `TreeDisplayDataAPI`, etc). The tree-display is kept
alive until tree-rebuild as runtime data of the space, so that further queries
based on the display type can be executed (e.g. "does the display support
selection syncing?", "does it support restriction toggle columns?", etc.).
New files are in a new `space_outliner/tree` sub-directory.
With the new design, display modes become proper units, making them more
maintainable, safer and testable. It should also be easier now to add new
display modes.
2020-11-06 20:54:20 +01:00
|
|
|
}
|
|
|
|
|
|
2020-08-07 11:47:23 -06:00
|
|
|
return (SpaceLink *)space_outliner_new;
|
2008-11-14 17:05:25 +00:00
|
|
|
}
|
|
|
|
|
|
2020-04-03 13:25:03 +02:00
|
|
|
static void outliner_id_remap(ScrArea *UNUSED(area), SpaceLink *slink, ID *old_id, ID *new_id)
|
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing
processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock
was pretty much impossible, except for a few special cases.
Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite
a few ID usages were missed or wrongly handled that way).
One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling
by using library_query utils to allow generic handling of those, which is now the case
(now, generic ID links handling is only "knwon" from readfile.c and library_query.c).
This commit also adds backends to allow live replacement and deletion of datablocks in Blender
(so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one,
or NULL one in case of unlinking).
This will allow nice new features, like ability to easily reload or relocate libraries, real immediate
deletion of datablocks in blender, replacement of one datablock by another, etc.
Some of those are for next commits.
A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core.
Though it was tested rather deeply, being totally impossible to check all possible ID usage cases,
it's likely there are some remaining issues and bugs in new code... Please report them! ;)
Review task: D2027 (https://developer.blender.org/D2027).
Reviewed by campbellbarton, thanks a bunch.
2016-06-22 17:29:38 +02:00
|
|
|
{
|
2020-08-07 11:47:23 -06:00
|
|
|
SpaceOutliner *space_outliner = (SpaceOutliner *)slink;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing
processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock
was pretty much impossible, except for a few special cases.
Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite
a few ID usages were missed or wrongly handled that way).
One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling
by using library_query utils to allow generic handling of those, which is now the case
(now, generic ID links handling is only "knwon" from readfile.c and library_query.c).
This commit also adds backends to allow live replacement and deletion of datablocks in Blender
(so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one,
or NULL one in case of unlinking).
This will allow nice new features, like ability to easily reload or relocate libraries, real immediate
deletion of datablocks in blender, replacement of one datablock by another, etc.
Some of those are for next commits.
A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core.
Though it was tested rather deeply, being totally impossible to check all possible ID usage cases,
it's likely there are some remaining issues and bugs in new code... Please report them! ;)
Review task: D2027 (https://developer.blender.org/D2027).
Reviewed by campbellbarton, thanks a bunch.
2016-06-22 17:29:38 +02:00
|
|
|
/* Some early out checks. */
|
|
|
|
|
if (!TREESTORE_ID_TYPE(old_id)) {
|
|
|
|
|
return; /* ID type is not used by outilner... */
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-08-07 11:47:23 -06:00
|
|
|
if (space_outliner->search_tse.id == old_id) {
|
|
|
|
|
space_outliner->search_tse.id = new_id;
|
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing
processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock
was pretty much impossible, except for a few special cases.
Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite
a few ID usages were missed or wrongly handled that way).
One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling
by using library_query utils to allow generic handling of those, which is now the case
(now, generic ID links handling is only "knwon" from readfile.c and library_query.c).
This commit also adds backends to allow live replacement and deletion of datablocks in Blender
(so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one,
or NULL one in case of unlinking).
This will allow nice new features, like ability to easily reload or relocate libraries, real immediate
deletion of datablocks in blender, replacement of one datablock by another, etc.
Some of those are for next commits.
A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core.
Though it was tested rather deeply, being totally impossible to check all possible ID usage cases,
it's likely there are some remaining issues and bugs in new code... Please report them! ;)
Review task: D2027 (https://developer.blender.org/D2027).
Reviewed by campbellbarton, thanks a bunch.
2016-06-22 17:29:38 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-08-07 11:47:23 -06:00
|
|
|
if (space_outliner->treestore) {
|
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing
processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock
was pretty much impossible, except for a few special cases.
Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite
a few ID usages were missed or wrongly handled that way).
One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling
by using library_query utils to allow generic handling of those, which is now the case
(now, generic ID links handling is only "knwon" from readfile.c and library_query.c).
This commit also adds backends to allow live replacement and deletion of datablocks in Blender
(so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one,
or NULL one in case of unlinking).
This will allow nice new features, like ability to easily reload or relocate libraries, real immediate
deletion of datablocks in blender, replacement of one datablock by another, etc.
Some of those are for next commits.
A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core.
Though it was tested rather deeply, being totally impossible to check all possible ID usage cases,
it's likely there are some remaining issues and bugs in new code... Please report them! ;)
Review task: D2027 (https://developer.blender.org/D2027).
Reviewed by campbellbarton, thanks a bunch.
2016-06-22 17:29:38 +02:00
|
|
|
TreeStoreElem *tselem;
|
|
|
|
|
BLI_mempool_iter iter;
|
|
|
|
|
bool changed = false;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-08-07 11:47:23 -06:00
|
|
|
BLI_mempool_iternew(space_outliner->treestore, &iter);
|
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing
processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock
was pretty much impossible, except for a few special cases.
Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite
a few ID usages were missed or wrongly handled that way).
One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling
by using library_query utils to allow generic handling of those, which is now the case
(now, generic ID links handling is only "knwon" from readfile.c and library_query.c).
This commit also adds backends to allow live replacement and deletion of datablocks in Blender
(so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one,
or NULL one in case of unlinking).
This will allow nice new features, like ability to easily reload or relocate libraries, real immediate
deletion of datablocks in blender, replacement of one datablock by another, etc.
Some of those are for next commits.
A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core.
Though it was tested rather deeply, being totally impossible to check all possible ID usage cases,
it's likely there are some remaining issues and bugs in new code... Please report them! ;)
Review task: D2027 (https://developer.blender.org/D2027).
Reviewed by campbellbarton, thanks a bunch.
2016-06-22 17:29:38 +02:00
|
|
|
while ((tselem = BLI_mempool_iterstep(&iter))) {
|
|
|
|
|
if (tselem->id == old_id) {
|
|
|
|
|
tselem->id = new_id;
|
|
|
|
|
changed = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-12-05 14:41:20 +01:00
|
|
|
|
|
|
|
|
/* Note that the Outliner may not be the active editor of the area, and hence not initialized.
|
|
|
|
|
* So runtime data might not have been created yet. */
|
|
|
|
|
if (space_outliner->runtime && space_outliner->runtime->treehash && changed) {
|
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing
processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock
was pretty much impossible, except for a few special cases.
Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite
a few ID usages were missed or wrongly handled that way).
One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling
by using library_query utils to allow generic handling of those, which is now the case
(now, generic ID links handling is only "knwon" from readfile.c and library_query.c).
This commit also adds backends to allow live replacement and deletion of datablocks in Blender
(so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one,
or NULL one in case of unlinking).
This will allow nice new features, like ability to easily reload or relocate libraries, real immediate
deletion of datablocks in blender, replacement of one datablock by another, etc.
Some of those are for next commits.
A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core.
Though it was tested rather deeply, being totally impossible to check all possible ID usage cases,
it's likely there are some remaining issues and bugs in new code... Please report them! ;)
Review task: D2027 (https://developer.blender.org/D2027).
Reviewed by campbellbarton, thanks a bunch.
2016-06-22 17:29:38 +02:00
|
|
|
/* rebuild hash table, because it depends on ids too */
|
|
|
|
|
/* postpone a full rebuild because this can be called many times on-free */
|
2020-08-07 11:47:23 -06:00
|
|
|
space_outliner->storeflag |= SO_TREESTORE_REBUILD;
|
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing
processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock
was pretty much impossible, except for a few special cases.
Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite
a few ID usages were missed or wrongly handled that way).
One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling
by using library_query utils to allow generic handling of those, which is now the case
(now, generic ID links handling is only "knwon" from readfile.c and library_query.c).
This commit also adds backends to allow live replacement and deletion of datablocks in Blender
(so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one,
or NULL one in case of unlinking).
This will allow nice new features, like ability to easily reload or relocate libraries, real immediate
deletion of datablocks in blender, replacement of one datablock by another, etc.
Some of those are for next commits.
A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core.
Though it was tested rather deeply, being totally impossible to check all possible ID usage cases,
it's likely there are some remaining issues and bugs in new code... Please report them! ;)
Review task: D2027 (https://developer.blender.org/D2027).
Reviewed by campbellbarton, thanks a bunch.
2016-06-22 17:29:38 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-04-03 13:25:03 +02:00
|
|
|
static void outliner_deactivate(struct ScrArea *area)
|
2019-05-18 17:09:45 -07:00
|
|
|
{
|
|
|
|
|
/* Remove hover highlights */
|
2020-08-07 11:47:23 -06:00
|
|
|
SpaceOutliner *space_outliner = area->spacedata.first;
|
2020-11-26 14:19:05 -07:00
|
|
|
outliner_flag_set(&space_outliner->tree, TSE_HIGHLIGHTED_ANY, false);
|
2020-06-17 20:40:22 +02:00
|
|
|
ED_region_tag_redraw_no_rebuild(BKE_area_find_region_type(area, RGN_TYPE_WINDOW));
|
2019-05-18 17:09:45 -07:00
|
|
|
}
|
|
|
|
|
|
2008-12-12 16:29:33 +00:00
|
|
|
/* only called once, from space_api/spacetypes.c */
|
2008-11-14 17:05:25 +00:00
|
|
|
void ED_spacetype_outliner(void)
|
|
|
|
|
{
|
2012-05-07 17:56:30 +00:00
|
|
|
SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype time");
|
2008-12-08 15:02:57 +00:00
|
|
|
ARegionType *art;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-05-07 17:56:30 +00:00
|
|
|
st->spaceid = SPACE_OUTLINER;
|
2008-12-08 15:02:57 +00:00
|
|
|
strncpy(st->name, "Outliner", BKE_ST_MAXNAME);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-08-04 14:39:53 +02:00
|
|
|
st->create = outliner_create;
|
2012-05-07 17:56:30 +00:00
|
|
|
st->free = outliner_free;
|
|
|
|
|
st->init = outliner_init;
|
|
|
|
|
st->duplicate = outliner_duplicate;
|
|
|
|
|
st->operatortypes = outliner_operatortypes;
|
|
|
|
|
st->keymap = outliner_keymap;
|
|
|
|
|
st->dropboxes = outliner_dropboxes;
|
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing
processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock
was pretty much impossible, except for a few special cases.
Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite
a few ID usages were missed or wrongly handled that way).
One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling
by using library_query utils to allow generic handling of those, which is now the case
(now, generic ID links handling is only "knwon" from readfile.c and library_query.c).
This commit also adds backends to allow live replacement and deletion of datablocks in Blender
(so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one,
or NULL one in case of unlinking).
This will allow nice new features, like ability to easily reload or relocate libraries, real immediate
deletion of datablocks in blender, replacement of one datablock by another, etc.
Some of those are for next commits.
A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core.
Though it was tested rather deeply, being totally impossible to check all possible ID usage cases,
it's likely there are some remaining issues and bugs in new code... Please report them! ;)
Review task: D2027 (https://developer.blender.org/D2027).
Reviewed by campbellbarton, thanks a bunch.
2016-06-22 17:29:38 +02:00
|
|
|
st->id_remap = outliner_id_remap;
|
2019-05-18 17:09:45 -07:00
|
|
|
st->deactivate = outliner_deactivate;
|
2020-12-11 21:54:10 +01:00
|
|
|
st->context = outliner_context;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2008-12-08 15:02:57 +00:00
|
|
|
/* regions: main window */
|
2013-11-05 01:29:45 +00:00
|
|
|
art = MEM_callocN(sizeof(ARegionType), "spacetype outliner region");
|
2008-12-08 15:02:57 +00:00
|
|
|
art->regionid = RGN_TYPE_WINDOW;
|
2019-08-08 22:00:57 -06:00
|
|
|
art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2015-11-28 17:14:45 +01:00
|
|
|
art->init = outliner_main_region_init;
|
|
|
|
|
art->draw = outliner_main_region_draw;
|
|
|
|
|
art->free = outliner_main_region_free;
|
|
|
|
|
art->listener = outliner_main_region_listener;
|
2017-12-15 15:46:42 +01:00
|
|
|
art->message_subscribe = outliner_main_region_message_subscribe;
|
2008-12-08 15:02:57 +00:00
|
|
|
BLI_addhead(&st->regiontypes, art);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2008-12-08 15:02:57 +00:00
|
|
|
/* regions: header */
|
2013-11-05 01:29:45 +00:00
|
|
|
art = MEM_callocN(sizeof(ARegionType), "spacetype outliner header region");
|
2008-12-08 15:02:57 +00:00
|
|
|
art->regionid = RGN_TYPE_HEADER;
|
2012-05-07 17:56:30 +00:00
|
|
|
art->prefsizey = HEADERY;
|
2019-08-08 22:00:57 -06:00
|
|
|
art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_HEADER;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2015-11-28 17:14:45 +01:00
|
|
|
art->init = outliner_header_region_init;
|
|
|
|
|
art->draw = outliner_header_region_draw;
|
|
|
|
|
art->free = outliner_header_region_free;
|
|
|
|
|
art->listener = outliner_header_region_listener;
|
2008-12-08 15:02:57 +00:00
|
|
|
BLI_addhead(&st->regiontypes, art);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2008-12-08 15:02:57 +00:00
|
|
|
BKE_spacetype_register(st);
|
2008-11-14 17:05:25 +00:00
|
|
|
}
|