Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-05-16 19:41:11 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-05-17 16:57:33 +0300
commitedf6676a77b30290918e60547544bc1a6f7a8838 (patch)
tree26012f315c75686553e6be87b73ad270b98eb01a /source/blender/makesdna/DNA_workspace_types.h
parent20cc14e2b7551bb043472174b8be79d8aaa4df3d (diff)
Tool System: per space/mode tool support
This patch adds support for: - Per space-type tools (3D view and edit). - Per mode tools (object, edit, weight-paint .. etc). The top-bar shows the last activated tools options, this is a design issue with using a global topbar to show per-space settings. See D3395
Diffstat (limited to 'source/blender/makesdna/DNA_workspace_types.h')
-rw-r--r--source/blender/makesdna/DNA_workspace_types.h46
1 files changed, 37 insertions, 9 deletions
diff --git a/source/blender/makesdna/DNA_workspace_types.h b/source/blender/makesdna/DNA_workspace_types.h
index 4cc3929b4ea..693e4f672d2 100644
--- a/source/blender/makesdna/DNA_workspace_types.h
+++ b/source/blender/makesdna/DNA_workspace_types.h
@@ -53,16 +53,35 @@
/* Currently testing, allow to disable. */
#define USE_WORKSPACE_TOOL
-typedef struct bToolDef {
+#
+#
+typedef struct bToolRef_Runtime {
/* One of these must be defined. */
char keymap[64];
char manipulator_group[64];
char data_block[64];
-
- int spacetype;
/* index when a tool is a member of a group */
- int index;
-} bToolDef;
+ int index;
+} bToolRef_Runtime;
+
+
+/* Stored per mode. */
+typedef struct bToolRef {
+ struct bToolRef *next, *prev;
+ char idname[64];
+
+ /** bToolKey (spacetype, mode), used in 'WM_api.h' */
+ int space_type;
+ /**
+ * Value depends ont the 'space_type', object mode for 3D view, image editor has own mode too.
+ * RNA needs to handle using item function.
+ */
+ int mode;
+
+ /** Variables needed to operate the tool. */
+ bToolRef_Runtime *runtime;
+} bToolRef;
+
/**
* \brief Wrapper for bScreen.
@@ -97,13 +116,22 @@ typedef struct WorkSpace {
/* Feature tagging (use for addons) */
ListBase owner_ids DNA_PRIVATE_WORKSPACE_READ_WRITE; /* wmOwnerID */
- int pad;
- int flags DNA_PRIVATE_WORKSPACE; /* enum eWorkSpaceFlags */
+ struct ViewLayer *view_layer DNA_DEPRECATED;
/* should be: '#ifdef USE_WORKSPACE_TOOL'. */
- bToolDef tool;
- struct ViewLayer *view_layer DNA_DEPRECATED;
+ /** List of #bToolRef */
+ ListBase tools;
+
+ /**
+ * BAD DESIGN WARNING:
+ * This is a workaround for the topbar not knowing which tools spac */
+ char tools_space_type;
+ /** Type is different for each space-type. */
+ char tools_mode;
+
+ char _pad[2];
+ int flags DNA_PRIVATE_WORKSPACE; /* enum eWorkSpaceFlags */
} WorkSpace;
/* internal struct, but exported for read/write */