2011-02-17 20:48:12 +00:00
|
|
|
/*
|
2008-01-07 19:13:47 +00:00
|
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
2002-10-12 11:37:38 +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
|
2008-01-07 19:13:47 +00:00
|
|
|
* of the License, or (at your option) any later version.
|
2002-10-12 11:37:38 +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.
|
2002-10-12 11:37:38 +00:00
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
2008-01-07 19:13:47 +00:00
|
|
|
* ***** END GPL LICENSE BLOCK *****
|
2002-10-12 11:37:38 +00:00
|
|
|
*/
|
|
|
|
|
2011-02-17 20:48:12 +00:00
|
|
|
/** \file DNA_ID.h
|
|
|
|
* \ingroup DNA
|
|
|
|
* \brief ID and Library types, which are fundamental for sdna.
|
|
|
|
*/
|
|
|
|
|
2012-02-17 18:59:41 +00:00
|
|
|
#ifndef __DNA_ID_H__
|
|
|
|
#define __DNA_ID_H__
|
2011-12-30 07:25:49 +00:00
|
|
|
|
2006-11-17 04:46:48 +00:00
|
|
|
#include "DNA_listBase.h"
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
#ifdef __cplusplus
|
|
|
|
extern "C" {
|
|
|
|
#endif
|
|
|
|
|
|
|
|
struct Library;
|
|
|
|
struct FileData;
|
2006-11-17 04:46:48 +00:00
|
|
|
struct ID;
|
2012-12-27 15:07:19 +00:00
|
|
|
struct PackedFile;
|
2013-01-22 11:18:41 +00:00
|
|
|
struct GPUTexture;
|
2014-11-19 20:48:35 +01:00
|
|
|
|
2006-11-17 04:46:48 +00:00
|
|
|
typedef struct IDPropertyData {
|
|
|
|
void *pointer;
|
|
|
|
ListBase group;
|
2014-11-19 20:48:35 +01:00
|
|
|
int val, val2; /* note, we actually fit a double into these two ints */
|
2006-11-17 04:46:48 +00:00
|
|
|
} IDPropertyData;
|
|
|
|
|
|
|
|
typedef struct IDProperty {
|
|
|
|
struct IDProperty *next, *prev;
|
|
|
|
char type, subtype;
|
|
|
|
short flag;
|
2014-11-19 20:48:35 +01:00
|
|
|
char name[64]; /* MAX_IDPROP_NAME */
|
|
|
|
|
|
|
|
/* saved is used to indicate if this struct has been saved yet.
|
|
|
|
* seemed like a good idea as a pad var was needed anyway :) */
|
|
|
|
int saved;
|
|
|
|
IDPropertyData data; /* note, alignment for 64 bits */
|
|
|
|
|
|
|
|
/* array length, also (this is important!) string length + 1.
|
|
|
|
* the idea is to be able to reuse array realloc functions on strings.*/
|
|
|
|
int len;
|
|
|
|
|
|
|
|
/* Strings and arrays are both buffered, though the buffer isn't saved. */
|
2011-11-11 13:09:14 +00:00
|
|
|
/* totallen is total length of allocated array/string, including a buffer.
|
2014-11-19 20:48:35 +01:00
|
|
|
* Note that the buffering is mild; the code comes from python's list implementation. */
|
|
|
|
int totallen;
|
2006-11-17 04:46:48 +00:00
|
|
|
} IDProperty;
|
|
|
|
|
2014-11-19 20:48:35 +01:00
|
|
|
#define MAX_IDPROP_NAME 64
|
|
|
|
#define DEFAULT_ALLOC_FOR_NULL_STRINGS 64
|
2006-11-17 04:46:48 +00:00
|
|
|
|
|
|
|
/*->type*/
|
2014-11-19 20:48:35 +01:00
|
|
|
enum {
|
|
|
|
IDP_STRING = 0,
|
|
|
|
IDP_INT = 1,
|
|
|
|
IDP_FLOAT = 2,
|
|
|
|
IDP_ARRAY = 5,
|
|
|
|
IDP_GROUP = 6,
|
|
|
|
IDP_ID = 7,
|
|
|
|
IDP_DOUBLE = 8,
|
|
|
|
IDP_IDPARRAY = 9,
|
|
|
|
IDP_NUMTYPES = 10,
|
|
|
|
};
|
2006-11-17 04:46:48 +00:00
|
|
|
|
2011-11-15 09:12:10 +00:00
|
|
|
/*->subtype */
|
|
|
|
|
|
|
|
/* IDP_STRING */
|
2014-11-19 20:48:35 +01:00
|
|
|
enum {
|
|
|
|
IDP_STRING_SUB_UTF8 = 0, /* default */
|
|
|
|
IDP_STRING_SUB_BYTE = 1, /* arbitrary byte array, _not_ null terminated */
|
|
|
|
};
|
2011-11-15 09:12:10 +00:00
|
|
|
|
2017-03-30 17:01:23 +02:00
|
|
|
/* IDP_GROUP */
|
|
|
|
enum {
|
2017-05-03 18:55:40 +02:00
|
|
|
IDP_GROUP_SUB_NONE = 0, /* default */
|
|
|
|
IDP_GROUP_SUB_MODE_OBJECT = 1, /* object mode settings */
|
|
|
|
IDP_GROUP_SUB_MODE_EDIT = 2, /* mesh edit mode settings */
|
|
|
|
IDP_GROUP_SUB_ENGINE_RENDER = 3, /* render engine settings */
|
|
|
|
IDP_GROUP_SUB_OVERRIDE = 4, /* data override */
|
|
|
|
IDP_GROUP_SUB_MODE_PAINT_WEIGHT = 5, /* weight paint mode settings */
|
2017-05-04 19:59:27 +02:00
|
|
|
IDP_GROUP_SUB_MODE_PAINT_VERTEX = 6, /* vertex paint mode settings */
|
2017-03-30 17:01:23 +02:00
|
|
|
};
|
|
|
|
|
2014-11-19 20:48:35 +01:00
|
|
|
/*->flag*/
|
|
|
|
enum {
|
|
|
|
IDP_FLAG_GHOST = 1 << 7, /* this means the property is set but RNA will return false when checking
|
|
|
|
* 'RNA_property_is_set', currently this is a runtime flag */
|
|
|
|
};
|
2011-11-15 09:12:10 +00:00
|
|
|
|
2007-12-24 18:53:37 +00:00
|
|
|
/* add any future new id property types here.*/
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2003-04-27 11:55:33 +00:00
|
|
|
/* watch it: Sequence has identical beginning. */
|
2002-10-12 11:37:38 +00:00
|
|
|
/**
|
|
|
|
* ID is the first thing included in all serializable types. It
|
|
|
|
* provides a common handle to place all data in double-linked lists.
|
|
|
|
* */
|
2006-11-17 04:46:48 +00:00
|
|
|
|
2012-01-11 08:51:06 +00:00
|
|
|
/* 2 characters for ID code and 64 for actual name */
|
2014-11-19 20:48:35 +01:00
|
|
|
#define MAX_ID_NAME 66
|
2007-12-24 18:53:37 +00:00
|
|
|
|
2013-03-18 11:44:56 +00:00
|
|
|
/* There's a nasty circular dependency here.... 'void *' to the rescue! I
|
2006-11-17 04:46:48 +00:00
|
|
|
* really wonder why this is needed. */
|
2002-10-12 11:37:38 +00:00
|
|
|
typedef struct ID {
|
|
|
|
void *next, *prev;
|
|
|
|
struct ID *newid;
|
|
|
|
struct Library *lib;
|
2012-07-08 00:04:41 +00:00
|
|
|
char name[66]; /* MAX_ID_NAME */
|
2002-10-12 11:37:38 +00:00
|
|
|
/**
|
Split id->flag in two, persistent flags and runtime tags.
This is purely internal sanitizing/cleanup, no change in behavior is expected at all.
This change was also needed because we were getting short on ID flags, and
future enhancement of 'user_one' ID behavior requires two new ones.
id->flag remains for persistent data (fakeuser only, so far!), this also allows us
100% backward & forward compatibility.
New id->tag is used for most flags. Though written in .blend files, its content
is cleared at read time.
Note that .blend file version was bumped, so that we can clear runtimeflags from
old .blends, important in case we add new persistent flags in future.
Also, behavior of tags (either status ones, or whether they need to be cleared before/after use)
has been added as comments to their declaration.
Reviewers: sergey, campbellbarton
Differential Revision: https://developer.blender.org/D1683
2015-12-27 11:53:50 +01:00
|
|
|
* LIB_... flags report on status of the datablock this ID belongs to (persistent, saved to and read from .blend).
|
2002-10-12 11:37:38 +00:00
|
|
|
*/
|
|
|
|
short flag;
|
Split id->flag in two, persistent flags and runtime tags.
This is purely internal sanitizing/cleanup, no change in behavior is expected at all.
This change was also needed because we were getting short on ID flags, and
future enhancement of 'user_one' ID behavior requires two new ones.
id->flag remains for persistent data (fakeuser only, so far!), this also allows us
100% backward & forward compatibility.
New id->tag is used for most flags. Though written in .blend files, its content
is cleared at read time.
Note that .blend file version was bumped, so that we can clear runtimeflags from
old .blends, important in case we add new persistent flags in future.
Also, behavior of tags (either status ones, or whether they need to be cleared before/after use)
has been added as comments to their declaration.
Reviewers: sergey, campbellbarton
Differential Revision: https://developer.blender.org/D1683
2015-12-27 11:53:50 +01:00
|
|
|
/**
|
|
|
|
* LIB_TAG_... tags (runtime only, cleared at read time).
|
|
|
|
*/
|
|
|
|
short tag;
|
|
|
|
short pad_s1;
|
2013-12-08 13:34:37 +06:00
|
|
|
int us;
|
Split id->flag in two, persistent flags and runtime tags.
This is purely internal sanitizing/cleanup, no change in behavior is expected at all.
This change was also needed because we were getting short on ID flags, and
future enhancement of 'user_one' ID behavior requires two new ones.
id->flag remains for persistent data (fakeuser only, so far!), this also allows us
100% backward & forward compatibility.
New id->tag is used for most flags. Though written in .blend files, its content
is cleared at read time.
Note that .blend file version was bumped, so that we can clear runtimeflags from
old .blends, important in case we add new persistent flags in future.
Also, behavior of tags (either status ones, or whether they need to be cleared before/after use)
has been added as comments to their declaration.
Reviewers: sergey, campbellbarton
Differential Revision: https://developer.blender.org/D1683
2015-12-27 11:53:50 +01:00
|
|
|
int icon_id;
|
2006-11-17 04:46:48 +00:00
|
|
|
IDProperty *properties;
|
2002-10-12 11:37:38 +00:00
|
|
|
} ID;
|
|
|
|
|
|
|
|
/**
|
2003-04-27 11:55:33 +00:00
|
|
|
* For each library file used, a Library struct is added to Main
|
2006-12-01 10:12:41 +00:00
|
|
|
* WARNING: readfile.c, expand_doit() reads this struct without DNA check!
|
2002-10-12 11:37:38 +00:00
|
|
|
*/
|
|
|
|
typedef struct Library {
|
|
|
|
ID id;
|
|
|
|
struct FileData *filedata;
|
2014-11-19 20:48:35 +01:00
|
|
|
char name[1024]; /* path name used for reading, can be relative and edited in the outliner */
|
|
|
|
|
|
|
|
/* absolute filepath, this is only for convenience, 'name' is the real path used on file read but in
|
|
|
|
* some cases its useful to access the absolute one.
|
|
|
|
* This is set on file read.
|
|
|
|
* Use BKE_library_filepath_set() rather than setting 'name' directly and it will be kept in sync - campbell */
|
|
|
|
char filepath[1024];
|
|
|
|
|
2010-04-22 08:25:05 +00:00
|
|
|
struct Library *parent; /* set for indirectly linked libs, used in the outliner and while reading */
|
2012-12-27 15:07:19 +00:00
|
|
|
|
|
|
|
struct PackedFile *packedfile;
|
2016-06-07 01:54:59 +10:00
|
|
|
|
2016-12-23 12:54:51 +01:00
|
|
|
/* Temp data needed by read/write code. */
|
2016-06-07 01:54:59 +10:00
|
|
|
int temp_index;
|
2016-12-23 12:54:51 +01:00
|
|
|
short versionfile, subversionfile; /* see BLENDER_VERSION, BLENDER_SUBVERSION, needed for do_versions */
|
2002-10-12 11:37:38 +00:00
|
|
|
} Library;
|
|
|
|
|
2011-05-16 18:37:54 +00:00
|
|
|
enum eIconSizes {
|
2012-06-15 14:11:05 +00:00
|
|
|
ICON_SIZE_ICON = 0,
|
2015-05-11 16:29:12 +02:00
|
|
|
ICON_SIZE_PREVIEW = 1,
|
|
|
|
|
|
|
|
NUM_ICON_SIZES
|
|
|
|
};
|
|
|
|
|
|
|
|
/* for PreviewImage->flag */
|
|
|
|
enum ePreviewImage_Flag {
|
|
|
|
PRV_CHANGED = (1 << 0),
|
|
|
|
PRV_USER_EDITED = (1 << 1), /* if user-edited, do not auto-update this anymore! */
|
2011-05-16 18:37:54 +00:00
|
|
|
};
|
2007-09-02 17:25:03 +00:00
|
|
|
|
2016-10-27 09:51:10 +02:00
|
|
|
/* for PreviewImage->tag */
|
|
|
|
enum {
|
|
|
|
PRV_TAG_DEFFERED = (1 << 0), /* Actual loading of preview is deffered. */
|
|
|
|
PRV_TAG_DEFFERED_RENDERING = (1 << 1), /* Deffered preview is being loaded. */
|
|
|
|
PRV_TAG_DEFFERED_DELETE = (1 << 2), /* Deffered preview should be deleted asap. */
|
|
|
|
};
|
|
|
|
|
2007-09-02 17:25:03 +00:00
|
|
|
typedef struct PreviewImage {
|
2011-05-16 18:37:54 +00:00
|
|
|
/* All values of 2 are really NUM_ICON_SIZES */
|
2007-09-02 17:25:03 +00:00
|
|
|
unsigned int w[2];
|
2011-01-22 04:40:15 +00:00
|
|
|
unsigned int h[2];
|
2015-05-11 16:29:12 +02:00
|
|
|
short flag[2];
|
2010-07-14 14:11:03 +00:00
|
|
|
short changed_timestamp[2];
|
2012-05-03 21:35:04 +00:00
|
|
|
unsigned int *rect[2];
|
2015-05-11 16:29:12 +02:00
|
|
|
|
|
|
|
/* Runtime-only data. */
|
2013-01-22 11:18:41 +00:00
|
|
|
struct GPUTexture *gputexture[2];
|
2015-05-11 16:29:12 +02:00
|
|
|
int icon_id; /* Used by previews outside of ID context. */
|
|
|
|
|
2016-10-27 09:51:10 +02:00
|
|
|
short tag; /* Runtime data. */
|
|
|
|
char pad[2];
|
2007-09-02 17:25:03 +00:00
|
|
|
} PreviewImage;
|
|
|
|
|
2015-05-11 16:29:12 +02:00
|
|
|
#define PRV_DEFERRED_DATA(prv) \
|
2016-10-27 09:51:10 +02:00
|
|
|
(CHECK_TYPE_INLINE(prv, PreviewImage *), BLI_assert((prv)->tag & PRV_TAG_DEFFERED), (void *)((prv) + 1))
|
2015-05-11 16:29:12 +02:00
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
/**
|
|
|
|
* Defines for working with IDs.
|
|
|
|
*
|
|
|
|
* The tags represent types! This is a dirty way of enabling RTTI. The
|
|
|
|
* sig_byte end endian defines aren't really used much.
|
|
|
|
*
|
|
|
|
**/
|
|
|
|
|
2011-09-19 08:02:17 +00:00
|
|
|
#ifdef __BIG_ENDIAN__
|
|
|
|
/* big endian */
|
2014-08-08 02:07:15 +10:00
|
|
|
# define MAKE_ID2(c, d) ((c) << 8 | (d))
|
2002-10-12 11:37:38 +00:00
|
|
|
#else
|
2011-09-19 08:02:17 +00:00
|
|
|
/* little endian */
|
2014-08-08 02:07:15 +10:00
|
|
|
# define MAKE_ID2(c, d) ((d) << 8 | (c))
|
2002-10-12 11:37:38 +00:00
|
|
|
#endif
|
|
|
|
|
2015-08-14 17:30:32 +10:00
|
|
|
/**
|
|
|
|
* ID from database.
|
|
|
|
*
|
|
|
|
* Written to #BHead.code (for file IO)
|
|
|
|
* and the first 2 bytes of #ID.name (for runtime checks, see #GS macro).
|
|
|
|
*/
|
2016-07-28 15:21:53 +02:00
|
|
|
typedef enum ID_Type {
|
|
|
|
ID_SCE = MAKE_ID2('S', 'C'), /* Scene */
|
|
|
|
ID_LI = MAKE_ID2('L', 'I'), /* Library */
|
|
|
|
ID_OB = MAKE_ID2('O', 'B'), /* Object */
|
|
|
|
ID_ME = MAKE_ID2('M', 'E'), /* Mesh */
|
|
|
|
ID_CU = MAKE_ID2('C', 'U'), /* Curve */
|
|
|
|
ID_MB = MAKE_ID2('M', 'B'), /* MetaBall */
|
|
|
|
ID_MA = MAKE_ID2('M', 'A'), /* Material */
|
|
|
|
ID_TE = MAKE_ID2('T', 'E'), /* Tex (Texture) */
|
|
|
|
ID_IM = MAKE_ID2('I', 'M'), /* Image */
|
|
|
|
ID_LT = MAKE_ID2('L', 'T'), /* Lattice */
|
|
|
|
ID_LA = MAKE_ID2('L', 'A'), /* Lamp */
|
|
|
|
ID_CA = MAKE_ID2('C', 'A'), /* Camera */
|
|
|
|
ID_IP = MAKE_ID2('I', 'P'), /* Ipo (depreciated, replaced by FCurves) */
|
|
|
|
ID_KE = MAKE_ID2('K', 'E'), /* Key (shape key) */
|
|
|
|
ID_WO = MAKE_ID2('W', 'O'), /* World */
|
|
|
|
ID_SCR = MAKE_ID2('S', 'R'), /* Screen */
|
|
|
|
ID_VF = MAKE_ID2('V', 'F'), /* VFont (Vector Font) */
|
|
|
|
ID_TXT = MAKE_ID2('T', 'X'), /* Text */
|
|
|
|
ID_SPK = MAKE_ID2('S', 'K'), /* Speaker */
|
|
|
|
ID_SO = MAKE_ID2('S', 'O'), /* Sound */
|
|
|
|
ID_GR = MAKE_ID2('G', 'R'), /* Group */
|
|
|
|
ID_AR = MAKE_ID2('A', 'R'), /* bArmature */
|
|
|
|
ID_AC = MAKE_ID2('A', 'C'), /* bAction */
|
|
|
|
ID_NT = MAKE_ID2('N', 'T'), /* bNodeTree */
|
|
|
|
ID_BR = MAKE_ID2('B', 'R'), /* Brush */
|
|
|
|
ID_PA = MAKE_ID2('P', 'A'), /* ParticleSettings */
|
|
|
|
ID_GD = MAKE_ID2('G', 'D'), /* bGPdata, (Grease Pencil) */
|
|
|
|
ID_WM = MAKE_ID2('W', 'M'), /* WindowManager */
|
|
|
|
ID_MC = MAKE_ID2('M', 'C'), /* MovieClip */
|
|
|
|
ID_MSK = MAKE_ID2('M', 'S'), /* Mask */
|
|
|
|
ID_LS = MAKE_ID2('L', 'S'), /* FreestyleLineStyle */
|
|
|
|
ID_PAL = MAKE_ID2('P', 'L'), /* Palette */
|
|
|
|
ID_PC = MAKE_ID2('P', 'C'), /* PaintCurve */
|
Basic Alembic support
All in all, this patch adds an Alembic importer, an Alembic exporter,
and a new CacheFile data block which, for now, wraps around an Alembic
archive. This data block is made available through a new modifier ("Mesh
Sequence Cache") as well as a new constraint ("Transform Cache") to
somewhat properly support respectively geometric and transformation data
streaming from alembic caches.
A more in-depth documentation is to be found on the wiki, as well as a
guide to compile alembic: https://wiki.blender.org/index.php/
User:Kevindietrich/AlembicBasicIo.
Many thanks to everyone involved in this little project, and huge shout
out to "cgstrive" for the thorough testings with Maya, 3ds Max, Houdini
and Realflow as well as @fjuhec, @jensverwiebe and @jasperge for the
custom builds and compile fixes.
Reviewers: sergey, campbellbarton, mont29
Reviewed By: sergey, campbellbarton, mont29
Differential Revision: https://developer.blender.org/D2060
2016-08-06 06:20:37 +02:00
|
|
|
ID_CF = MAKE_ID2('C', 'F'), /* CacheFile */
|
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
|
|
|
ID_WS = MAKE_ID2('W', 'S'), /* WorkSpace */
|
2017-06-06 22:47:41 +02:00
|
|
|
ID_PRB = MAKE_ID2('P', 'R'), /* Probe */
|
2016-07-28 15:21:53 +02:00
|
|
|
} ID_Type;
|
|
|
|
|
|
|
|
/* Only used as 'placeholder' in .blend files for directly linked datablocks. */
|
|
|
|
#define ID_ID MAKE_ID2('I', 'D') /* (internal use only) */
|
|
|
|
|
|
|
|
/* Deprecated. */
|
|
|
|
#define ID_SCRN MAKE_ID2('S', 'N')
|
|
|
|
|
|
|
|
/* NOTE! Fake IDs, needed for g.sipo->blocktype or outliner */
|
2005-10-10 18:05:30 +00:00
|
|
|
#define ID_SEQ MAKE_ID2('S', 'Q')
|
|
|
|
/* constraint */
|
|
|
|
#define ID_CO MAKE_ID2('C', 'O')
|
|
|
|
/* pose (action channel, used to be ID_AC in code, so we keep code for backwards compat) */
|
|
|
|
#define ID_PO MAKE_ID2('A', 'C')
|
|
|
|
/* used in outliner... */
|
|
|
|
#define ID_NLA MAKE_ID2('N', 'L')
|
2006-11-25 13:07:28 +00:00
|
|
|
/* fluidsim Ipo */
|
|
|
|
#define ID_FLUIDSIM MAKE_ID2('F', 'S')
|
|
|
|
|
2015-11-10 16:20:28 +01:00
|
|
|
#define ID_FAKE_USERS(id) ((((ID *)id)->flag & LIB_FAKEUSER) ? 1 : 0)
|
|
|
|
#define ID_REAL_USERS(id) (((ID *)id)->us - ID_FAKE_USERS(id))
|
2017-01-04 10:25:27 +01:00
|
|
|
#define ID_EXTRA_USERS(id) (((ID *)id)->tag & LIB_TAG_EXTRAUSER ? 1 : 0)
|
2010-01-17 20:06:34 +00:00
|
|
|
|
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
|
|
|
#define ID_CHECK_UNDO(id) ((GS((id)->name) != ID_SCR) && (GS((id)->name) != ID_WM) && (GS((id)->name) != ID_WS))
|
2011-09-28 18:45:17 +00:00
|
|
|
|
2011-10-08 11:02:58 +00:00
|
|
|
#define ID_BLEND_PATH(_bmain, _id) ((_id)->lib ? (_id)->lib->filepath : (_bmain)->name)
|
|
|
|
|
Split id->flag in two, persistent flags and runtime tags.
This is purely internal sanitizing/cleanup, no change in behavior is expected at all.
This change was also needed because we were getting short on ID flags, and
future enhancement of 'user_one' ID behavior requires two new ones.
id->flag remains for persistent data (fakeuser only, so far!), this also allows us
100% backward & forward compatibility.
New id->tag is used for most flags. Though written in .blend files, its content
is cleared at read time.
Note that .blend file version was bumped, so that we can clear runtimeflags from
old .blends, important in case we add new persistent flags in future.
Also, behavior of tags (either status ones, or whether they need to be cleared before/after use)
has been added as comments to their declaration.
Reviewers: sergey, campbellbarton
Differential Revision: https://developer.blender.org/D1683
2015-12-27 11:53:50 +01:00
|
|
|
#define ID_MISSING(_id) (((_id)->tag & LIB_TAG_MISSING) != 0)
|
First step to handle missing libs/datablocks when reading a file.
Idea is, instead of ignoring completely missing linked datablocks, to
create void placeholders for them.
That way, you can work on your file, save it, and find again your missing data once
lib becomes available again. Or you can edit missing lib's path (in Outliner),
save and reload the file, and you are done.
Also, Outliner now shows broken libraries (and placeholders) with a 'broken lib' icon.
Future plans are also to be able to relocate missing libs and reload them at runtime.
Code notes:
- Placeholder ID is just a regular datablock of same type as expected linked one,
with 'default' data, and a LIB_MISSING bitflag set.
- To allow creation of such datablocks, creation of datablocks in BKE was split in two step:
+ Allocation of memory itself.
+ Setting of all internal data to default values.
See also the design task (T43351).
Reviewed by @campbellbarton, thanks a bunch!
Differential Revision: https://developer.blender.org/D1394
2015-10-20 14:44:57 +02:00
|
|
|
|
2016-07-06 14:11:01 +02:00
|
|
|
#define ID_IS_LINKED_DATABLOCK(_id) (((ID *)(_id))->lib != NULL)
|
|
|
|
|
2011-01-07 19:18:31 +00:00
|
|
|
#ifdef GS
|
2012-05-12 20:39:39 +00:00
|
|
|
# undef GS
|
2011-01-07 19:18:31 +00:00
|
|
|
#endif
|
2015-01-14 05:10:18 +11:00
|
|
|
#define GS(a) (CHECK_TYPE_ANY(a, char *, const char *, char [66], const char[66]), (*((const short *)(a))))
|
2011-01-07 19:18:31 +00:00
|
|
|
|
2016-11-30 15:25:54 +01:00
|
|
|
#define ID_NEW_SET(_id, _idn) \
|
|
|
|
(((ID *)(_id))->newid = (ID *)(_idn), ((ID *)(_id))->newid->tag |= LIB_TAG_NEW, (void *)((ID *)(_id))->newid)
|
|
|
|
#define ID_NEW_REMAP(a) if ((a) && (a)->id.newid) (a) = (void *)(a)->id.newid
|
2012-05-12 20:39:39 +00:00
|
|
|
|
Split id->flag in two, persistent flags and runtime tags.
This is purely internal sanitizing/cleanup, no change in behavior is expected at all.
This change was also needed because we were getting short on ID flags, and
future enhancement of 'user_one' ID behavior requires two new ones.
id->flag remains for persistent data (fakeuser only, so far!), this also allows us
100% backward & forward compatibility.
New id->tag is used for most flags. Though written in .blend files, its content
is cleared at read time.
Note that .blend file version was bumped, so that we can clear runtimeflags from
old .blends, important in case we add new persistent flags in future.
Also, behavior of tags (either status ones, or whether they need to be cleared before/after use)
has been added as comments to their declaration.
Reviewers: sergey, campbellbarton
Differential Revision: https://developer.blender.org/D1683
2015-12-27 11:53:50 +01:00
|
|
|
/* id->flag (persitent). */
|
2014-11-19 20:48:35 +01:00
|
|
|
enum {
|
|
|
|
LIB_FAKEUSER = 1 << 9,
|
Split id->flag in two, persistent flags and runtime tags.
This is purely internal sanitizing/cleanup, no change in behavior is expected at all.
This change was also needed because we were getting short on ID flags, and
future enhancement of 'user_one' ID behavior requires two new ones.
id->flag remains for persistent data (fakeuser only, so far!), this also allows us
100% backward & forward compatibility.
New id->tag is used for most flags. Though written in .blend files, its content
is cleared at read time.
Note that .blend file version was bumped, so that we can clear runtimeflags from
old .blends, important in case we add new persistent flags in future.
Also, behavior of tags (either status ones, or whether they need to be cleared before/after use)
has been added as comments to their declaration.
Reviewers: sergey, campbellbarton
Differential Revision: https://developer.blender.org/D1683
2015-12-27 11:53:50 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* id->tag (runtime-only).
|
|
|
|
*
|
|
|
|
* Those flags belong to three different categories, which have different expected handling in code:
|
|
|
|
*
|
|
|
|
* - RESET_BEFORE_USE: piece of code that wants to use such flag has to ensure they are properly 'reset' first.
|
|
|
|
* - RESET_AFTER_USE: piece of code that wants to use such flag has to ensure they are properly 'reset' after usage
|
|
|
|
* (though 'lifetime' of those flags is a bit fuzzy, e.g. _RECALC ones are reset on depsgraph
|
|
|
|
* evaluation...).
|
|
|
|
* - RESET_NEVER: those flags are 'status' one, and never actually need any reset (except on initialization
|
|
|
|
* during .blend file reading).
|
|
|
|
*/
|
|
|
|
enum {
|
|
|
|
/* RESET_NEVER Datablock is from current .blend file. */
|
|
|
|
LIB_TAG_LOCAL = 0,
|
|
|
|
/* RESET_NEVER Datablock is from a library, but is used (linked) directly by current .blend file. */
|
|
|
|
LIB_TAG_EXTERN = 1 << 0,
|
|
|
|
/* RESET_NEVER Datablock is from a library, and is only used (linked) inderectly through other libraries. */
|
|
|
|
LIB_TAG_INDIRECT = 1 << 1,
|
|
|
|
|
|
|
|
/* RESET_AFTER_USE Three flags used internally in readfile.c, to mark IDs needing to be read (only done once). */
|
|
|
|
LIB_TAG_NEED_EXPAND = 1 << 3,
|
|
|
|
LIB_TAG_TESTEXT = (LIB_TAG_NEED_EXPAND | LIB_TAG_EXTERN),
|
|
|
|
LIB_TAG_TESTIND = (LIB_TAG_NEED_EXPAND | LIB_TAG_INDIRECT),
|
|
|
|
/* RESET_AFTER_USE Flag used internally in readfile.c, to mark IDs needing to be linked from a library. */
|
|
|
|
LIB_TAG_READ = 1 << 4,
|
|
|
|
/* RESET_AFTER_USE */
|
|
|
|
LIB_TAG_NEED_LINK = 1 << 5,
|
|
|
|
|
|
|
|
/* RESET_NEVER tag datablock as a place-holder (because the real one could not be linked from its library e.g.). */
|
|
|
|
LIB_TAG_MISSING = 1 << 6,
|
|
|
|
|
2016-01-04 20:17:23 +01:00
|
|
|
/* tag datablock has having an extra user. */
|
|
|
|
LIB_TAG_EXTRAUSER = 1 << 2,
|
|
|
|
/* tag datablock has having actually increased usercount for the extra virtual user. */
|
|
|
|
LIB_TAG_EXTRAUSER_SET = 1 << 7,
|
|
|
|
|
2016-12-19 16:28:41 +01:00
|
|
|
/* RESET_AFTER_USE tag newly duplicated/copied IDs.
|
|
|
|
* Also used internally in readfile.c to mark datablocks needing do_versions. */
|
Split id->flag in two, persistent flags and runtime tags.
This is purely internal sanitizing/cleanup, no change in behavior is expected at all.
This change was also needed because we were getting short on ID flags, and
future enhancement of 'user_one' ID behavior requires two new ones.
id->flag remains for persistent data (fakeuser only, so far!), this also allows us
100% backward & forward compatibility.
New id->tag is used for most flags. Though written in .blend files, its content
is cleared at read time.
Note that .blend file version was bumped, so that we can clear runtimeflags from
old .blends, important in case we add new persistent flags in future.
Also, behavior of tags (either status ones, or whether they need to be cleared before/after use)
has been added as comments to their declaration.
Reviewers: sergey, campbellbarton
Differential Revision: https://developer.blender.org/D1683
2015-12-27 11:53:50 +01:00
|
|
|
LIB_TAG_NEW = 1 << 8,
|
|
|
|
/* RESET_BEFORE_USE free test flag.
|
|
|
|
* TODO make it a RESET_AFTER_USE too. */
|
|
|
|
LIB_TAG_DOIT = 1 << 10,
|
|
|
|
/* RESET_AFTER_USE tag existing data before linking so we know what is new. */
|
|
|
|
LIB_TAG_PRE_EXISTING = 1 << 11,
|
|
|
|
|
|
|
|
/* RESET_AFTER_USE, used by update code (depsgraph). */
|
|
|
|
LIB_TAG_ID_RECALC = 1 << 12,
|
|
|
|
LIB_TAG_ID_RECALC_DATA = 1 << 13,
|
|
|
|
LIB_TAG_ANIM_NO_RECALC = 1 << 14,
|
|
|
|
LIB_TAG_ID_RECALC_ALL = (LIB_TAG_ID_RECALC | LIB_TAG_ID_RECALC_DATA),
|
2014-11-19 20:48:35 +01:00
|
|
|
};
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2015-08-10 17:26:37 +02:00
|
|
|
/* To filter ID types (filter_id) */
|
|
|
|
/* XXX We cannot put all needed IDs inside an enum...
|
|
|
|
* We'll have to see whether we can fit all needed ones inside 32 values,
|
|
|
|
* or if we need to fallback to longlong defines :/
|
|
|
|
*/
|
|
|
|
enum {
|
|
|
|
FILTER_ID_AC = (1 << 0),
|
|
|
|
FILTER_ID_AR = (1 << 1),
|
|
|
|
FILTER_ID_BR = (1 << 2),
|
|
|
|
FILTER_ID_CA = (1 << 3),
|
|
|
|
FILTER_ID_CU = (1 << 4),
|
|
|
|
FILTER_ID_GD = (1 << 5),
|
|
|
|
FILTER_ID_GR = (1 << 6),
|
|
|
|
FILTER_ID_IM = (1 << 7),
|
|
|
|
FILTER_ID_LA = (1 << 8),
|
|
|
|
FILTER_ID_LS = (1 << 9),
|
|
|
|
FILTER_ID_LT = (1 << 10),
|
|
|
|
FILTER_ID_MA = (1 << 11),
|
|
|
|
FILTER_ID_MB = (1 << 12),
|
|
|
|
FILTER_ID_MC = (1 << 13),
|
|
|
|
FILTER_ID_ME = (1 << 14),
|
|
|
|
FILTER_ID_MSK = (1 << 15),
|
|
|
|
FILTER_ID_NT = (1 << 16),
|
|
|
|
FILTER_ID_OB = (1 << 17),
|
|
|
|
FILTER_ID_PAL = (1 << 18),
|
|
|
|
FILTER_ID_PC = (1 << 19),
|
|
|
|
FILTER_ID_SCE = (1 << 20),
|
|
|
|
FILTER_ID_SPK = (1 << 21),
|
|
|
|
FILTER_ID_SO = (1 << 22),
|
|
|
|
FILTER_ID_TE = (1 << 23),
|
|
|
|
FILTER_ID_TXT = (1 << 24),
|
|
|
|
FILTER_ID_VF = (1 << 25),
|
|
|
|
FILTER_ID_WO = (1 << 26),
|
2015-08-21 18:27:14 +02:00
|
|
|
FILTER_ID_PA = (1 << 27),
|
Basic Alembic support
All in all, this patch adds an Alembic importer, an Alembic exporter,
and a new CacheFile data block which, for now, wraps around an Alembic
archive. This data block is made available through a new modifier ("Mesh
Sequence Cache") as well as a new constraint ("Transform Cache") to
somewhat properly support respectively geometric and transformation data
streaming from alembic caches.
A more in-depth documentation is to be found on the wiki, as well as a
guide to compile alembic: https://wiki.blender.org/index.php/
User:Kevindietrich/AlembicBasicIo.
Many thanks to everyone involved in this little project, and huge shout
out to "cgstrive" for the thorough testings with Maya, 3ds Max, Houdini
and Realflow as well as @fjuhec, @jensverwiebe and @jasperge for the
custom builds and compile fixes.
Reviewers: sergey, campbellbarton, mont29
Reviewed By: sergey, campbellbarton, mont29
Differential Revision: https://developer.blender.org/D2060
2016-08-06 06:20:37 +02:00
|
|
|
FILTER_ID_CF = (1 << 28),
|
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
|
|
|
FILTER_ID_WS = (1 << 29),
|
2017-06-06 22:47:41 +02:00
|
|
|
FILTER_ID_PRB = (1 << 30),
|
2015-08-10 17:26:37 +02:00
|
|
|
};
|
|
|
|
|
2017-06-06 22:48:05 +02:00
|
|
|
/* IMPORTANT: this enum matches the order currently use in set_listbasepointers,
|
2016-08-08 17:51:15 +02:00
|
|
|
* keep them in sync! */
|
|
|
|
enum {
|
|
|
|
INDEX_ID_LI = 0,
|
|
|
|
INDEX_ID_IP,
|
|
|
|
INDEX_ID_AC,
|
|
|
|
INDEX_ID_KE,
|
|
|
|
INDEX_ID_GD,
|
|
|
|
INDEX_ID_NT,
|
|
|
|
INDEX_ID_IM,
|
|
|
|
INDEX_ID_TE,
|
|
|
|
INDEX_ID_MA,
|
|
|
|
INDEX_ID_VF,
|
|
|
|
INDEX_ID_AR,
|
|
|
|
INDEX_ID_CF,
|
|
|
|
INDEX_ID_ME,
|
|
|
|
INDEX_ID_CU,
|
|
|
|
INDEX_ID_MB,
|
|
|
|
INDEX_ID_LT,
|
|
|
|
INDEX_ID_LA,
|
|
|
|
INDEX_ID_CA,
|
|
|
|
INDEX_ID_TXT,
|
|
|
|
INDEX_ID_SO,
|
|
|
|
INDEX_ID_GR,
|
|
|
|
INDEX_ID_PAL,
|
|
|
|
INDEX_ID_PC,
|
|
|
|
INDEX_ID_BR,
|
|
|
|
INDEX_ID_PA,
|
|
|
|
INDEX_ID_SPK,
|
2017-06-06 22:47:41 +02:00
|
|
|
INDEX_ID_PRB,
|
2016-08-08 17:51:15 +02:00
|
|
|
INDEX_ID_WO,
|
|
|
|
INDEX_ID_MC,
|
|
|
|
INDEX_ID_SCR,
|
|
|
|
INDEX_ID_OB,
|
|
|
|
INDEX_ID_LS,
|
|
|
|
INDEX_ID_SCE,
|
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
|
|
|
INDEX_ID_WS,
|
2016-08-08 17:51:15 +02:00
|
|
|
INDEX_ID_WM,
|
|
|
|
INDEX_ID_MSK,
|
|
|
|
INDEX_ID_NULL,
|
|
|
|
};
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
#ifdef __cplusplus
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif
|