17bd5c9d4b
OVERVIEW * In 2.7 terminology, all layers and groups are now collection datablocks. * These collections are nestable, linkable, instanceable, overrideable, .. which opens up new ways to set up scenes and link + override data. * Viewport/render visibility and selectability are now a part of the collection and shared across all view layers and linkable. * View layers define which subset of the scene collection hierarchy is excluded for each. For many workflows one view layer can be used, these are more of an advanced feature now. OUTLINER * The outliner now has a "View Layer" display mode instead of "Collections", which can display the collections and/or objects in the view layer. * In this display mode, collections can be excluded with the right click menu. These will then be greyed out and their objects will be excluded. * To view collections not linked to any scene, the "Blender File" display mode can be used, with the new filtering option to just see Colleciton datablocks. * The outliner right click menus for collections and objects were reorganized. * Drag and drop still needs to be improved. Like before, dragging the icon or text gives different results, we'll unify this later. LINKING AND OVERRIDES * Collections can now be linked into the scene without creating an instance, with the link/append operator or from the collections view in the outliner. * Collections can get static overrides with the right click menu in the outliner, but this is rather unreliable and not clearly communicated at the moment. * We still need to improve the make override operator to turn collection instances into collections with overrides directly in the scene. PERFORMANCE * We tried to make performance not worse than before and improve it in some cases. The main thing that's still a bit slower is multiple scenes, we have to change the layer syncing to only updated affected scenes. * Collections keep a list of their parent collections for faster incremental updates in syncing and caching. * View layer bases are now in a object -> base hash to avoid quadratic time lookups internally and in API functions like visible_get(). VERSIONING * Compatibility with 2.7 files should be improved due to the new visibility controls. Of course users may not want to set up their scenes differently now to avoid having separate layers and groups. * Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero files. There's a few things which are know to be not quite compatible, like nested layer collections inside groups. * The versioning code for 2.8 files is quite complicated, and isolated behind #ifdef so it can be removed at the end of the release cycle. KNOWN ISSUES * The G-key group operators in the 3D viewport were left mostly as is, they need to be modified still to fit better. * Same for the groups panel in the object properties. This needs to be updated still, or perhaps replaced by something better. * Collections must all have a unique name. Less restrictive namespacing is to be done later, we'll have to see how important this is as all objects within the collections must also have a unique name anyway. * Full scene copy and delete scene are exactly doing the right thing yet. Differential Revision: https://developer.blender.org/D3383 https://code.blender.org/2018/05/collections-and-groups/
157 lines
4.4 KiB
C
157 lines
4.4 KiB
C
/*
|
||
* ***** 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.
|
||
*
|
||
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
||
* All rights reserved.
|
||
*
|
||
* The Original Code is: all of this file.
|
||
*
|
||
* Contributor(s): none yet.
|
||
*
|
||
* ***** END GPL LICENSE BLOCK *****
|
||
*/
|
||
#ifndef __BKE_MAIN_H__
|
||
#define __BKE_MAIN_H__
|
||
|
||
/** \file BKE_main.h
|
||
* \ingroup bke
|
||
* \since March 2001
|
||
* \author nzc
|
||
* \section aboutmain Main struct
|
||
* Main is the root of the 'database' of a Blender context. All data
|
||
* is stuffed into lists, and all these lists are knotted to here. A
|
||
* Blender file is not much more but a binary dump of these
|
||
* lists. This list of lists is not serialized itself.
|
||
*
|
||
* Oops... this should be a _types.h file.
|
||
*
|
||
*/
|
||
#include "DNA_listBase.h"
|
||
|
||
#include "BKE_library.h"
|
||
|
||
#ifdef __cplusplus
|
||
extern "C" {
|
||
#endif
|
||
|
||
struct Depsgraph;
|
||
struct Library;
|
||
struct MainLock;
|
||
struct GHash;
|
||
struct BLI_mempool;
|
||
|
||
/* Blender thumbnail, as written on file (width, height, and data as char RGBA). */
|
||
/* We pack pixel data after that struct. */
|
||
typedef struct BlendThumbnail {
|
||
int width, height;
|
||
char rect[0];
|
||
} BlendThumbnail;
|
||
|
||
/* Structs caching relations between data-blocks in a given Main. */
|
||
typedef struct MainIDRelationsEntry {
|
||
struct MainIDRelationsEntry *next;
|
||
/* WARNING! for user_to_used, that pointer is really an ID** one, but for used_to_user, it’s only an ID* one! */
|
||
struct ID **id_pointer;
|
||
int usage_flag; /* Using IDWALK_ enums, in BKE_library_query.h */
|
||
} MainIDRelationsEntry;
|
||
|
||
typedef struct MainIDRelations {
|
||
struct GHash *id_user_to_used;
|
||
struct GHash *id_used_to_user;
|
||
|
||
/* Private... */
|
||
struct BLI_mempool *entry_pool;
|
||
} MainIDRelations;
|
||
|
||
typedef struct Main {
|
||
struct Main *next, *prev;
|
||
char name[1024]; /* 1024 = FILE_MAX */
|
||
short versionfile, subversionfile; /* see BLENDER_VERSION, BLENDER_SUBVERSION */
|
||
short minversionfile, minsubversionfile;
|
||
uint64_t build_commit_timestamp; /* commit's timestamp from buildinfo */
|
||
char build_hash[16]; /* hash from buildinfo */
|
||
char recovered; /* indicate the main->name (file) is the recovered one */
|
||
/** All current ID's exist in the last memfile undo step. */
|
||
char is_memfile_undo_written;
|
||
|
||
BlendThumbnail *blen_thumb;
|
||
|
||
struct Library *curlib;
|
||
ListBase scene;
|
||
ListBase library;
|
||
ListBase object;
|
||
ListBase mesh;
|
||
ListBase curve;
|
||
ListBase mball;
|
||
ListBase mat;
|
||
ListBase tex;
|
||
ListBase image;
|
||
ListBase latt;
|
||
ListBase lamp;
|
||
ListBase camera;
|
||
ListBase ipo; // XXX deprecated
|
||
ListBase key;
|
||
ListBase world;
|
||
ListBase screen;
|
||
ListBase vfont;
|
||
ListBase text;
|
||
ListBase speaker;
|
||
ListBase lightprobe;
|
||
ListBase sound;
|
||
ListBase collection;
|
||
ListBase armature;
|
||
ListBase action;
|
||
ListBase nodetree;
|
||
ListBase brush;
|
||
ListBase particle;
|
||
ListBase palettes;
|
||
ListBase paintcurves;
|
||
ListBase wm;
|
||
ListBase gpencil;
|
||
ListBase movieclip;
|
||
ListBase mask;
|
||
ListBase linestyle;
|
||
ListBase cachefiles;
|
||
ListBase workspaces;
|
||
|
||
char id_tag_update[MAX_LIBARRAY];
|
||
|
||
/* Must be generated, used and freed by same code - never assume this is valid data unless you know
|
||
* when, who and how it was created.
|
||
* Used by code doing a lot of remapping etc. at once to speed things up. */
|
||
struct MainIDRelations *relations;
|
||
|
||
struct MainLock *lock;
|
||
} Main;
|
||
|
||
#define MAIN_VERSION_ATLEAST(main, ver, subver) \
|
||
((main)->versionfile > (ver) || (main->versionfile == (ver) && (main)->subversionfile >= (subver)))
|
||
|
||
#define MAIN_VERSION_OLDER(main, ver, subver) \
|
||
((main)->versionfile < (ver) || (main->versionfile == (ver) && (main)->subversionfile < (subver)))
|
||
|
||
#define BLEN_THUMB_SIZE 128
|
||
|
||
#define BLEN_THUMB_MEMSIZE(_x, _y) (sizeof(BlendThumbnail) + ((size_t)(_x) * (size_t)(_y)) * sizeof(int))
|
||
#define BLEN_THUMB_SAFE_MEMSIZE(_x, _y) ((uint64_t)_x * (uint64_t)_y < (SIZE_MAX / (sizeof(int) * 4)))
|
||
|
||
#ifdef __cplusplus
|
||
}
|
||
#endif
|
||
|
||
#endif /* __BKE_MAIN_H__ */
|