[Bf-blender-cvs] [006efb5fbc6] topbar: Cleanup: Remove leftovers from when branch was based on workspace branch
Julian Eisel
noreply at git.blender.org
Mon Oct 23 02:19:16 CEST 2017
Commit: 006efb5fbc6f937a852d5f8589253d742d9ec5bd
Author: Julian Eisel
Date: Mon Oct 23 02:10:02 2017 +0200
Branches: topbar
https://developer.blender.org/rB006efb5fbc6f937a852d5f8589253d742d9ec5bd
Cleanup: Remove leftovers from when branch was based on workspace branch
===================================================================
M source/blender/blenkernel/BKE_idcode.h
M source/blender/blenloader/intern/readblenentry.c
M source/blender/editors/include/ED_transform.h
M source/blender/makesdna/DNA_view3d_types.h
D source/blender/makesdna/dna_workspace_types.h
M source/blender/windowmanager/intern/wm_files.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_idcode.h b/source/blender/blenkernel/BKE_idcode.h
index 05912efbdfa..964a49435f1 100644
--- a/source/blender/blenkernel/BKE_idcode.h
+++ b/source/blender/blenkernel/BKE_idcode.h
@@ -37,7 +37,6 @@ const char *BKE_idcode_to_name_plural(short idcode);
const char *BKE_idcode_to_translation_context(short idcode);
short BKE_idcode_from_name(const char *name);
bool BKE_idcode_is_linkable(short idcode);
-bool BKE_idcode_is_appendable(short idcode);
bool BKE_idcode_is_valid(short idcode);
int BKE_idcode_to_idfilter(const short idcode);
diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c
index 03c25380ce2..8d90a11f5d9 100644
--- a/source/blender/blenloader/intern/readblenentry.c
+++ b/source/blender/blenloader/intern/readblenentry.c
@@ -265,6 +265,7 @@ LinkNode *BLO_blendhandle_get_previews(BlendHandle *bh, int ofblocktype, int *to
/**
* Gets the names of all the linkable datablock types available in a file. (e.g. "Scene", "Mesh", "Lamp", etc.).
*
+ * \param bh The blendhandle to access.
* \return A BLI_linklist of strings. The string links should be freed with malloc.
*/
LinkNode *BLO_blendhandle_get_linkable_groups(BlendHandle *bh)
diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h
index d271ed5d1a1..8fd0c8c68a8 100644
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@ -126,10 +126,10 @@ struct ReportList;
void BIF_clearTransformOrientation(struct bContext *C);
void BIF_removeTransformOrientation(struct bContext *C, struct TransformOrientation *ts);
+void BIF_removeTransformOrientationIndex(struct bContext *C, int index);
void BIF_createTransformOrientation(struct bContext *C, struct ReportList *reports,
const char *name, const bool use_view,
const bool activate, const bool overwrite);
-void BIF_removeTransformOrientationIndex(struct bContext *C, int index);
void BIF_selectTransformOrientation(struct bContext *C, struct TransformOrientation *ts);
void BIF_selectTransformOrientationValue(struct View3D *v3d, int orientation);
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index 25db8f086eb..fba83753a69 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -219,10 +219,6 @@ typedef struct View3D {
short flag3;
- /* Pointer to the active custom transform orientation. Storing this here so we can remove it correctly. */
- struct TransformOrientation *custom_orientation;
- void *pad5;
-
/* afterdraw, for xray & transparent */
struct ListBase afterdraw_transp;
struct ListBase afterdraw_xray;
diff --git a/source/blender/makesdna/dna_workspace_types.h b/source/blender/makesdna/dna_workspace_types.h
deleted file mode 100644
index cb46a155838..00000000000
--- a/source/blender/makesdna/dna_workspace_types.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file dna_workspace_types.h
- * \ingroup DNA
- *
- * Only use with API in BKE_workspace.h!
- */
-
-#ifndef __DNA_WORKSPACE_TYPES_H__
-#define __DNA_WORKSPACE_TYPES_H__
-
-#if !defined(DNA_NAMESPACE_WORKSPACE) && !defined(DNA_NAMESPACE)
-# error "This file shouldn't be included outside of workspace namespace."
-#endif
-
-/**
- * \brief Wrapper for bScreen.
- *
- * bScreens are IDs and thus stored in a main list-base. We also want to store a list-base of them within the
- * workspace (so each workspace can have its own set of screen-layouts) which would mess with the next/prev pointers.
- * So we use this struct to wrap a bScreen pointer with another pair of next/prev pointers.
- */
-typedef struct WorkSpaceLayout {
- struct WorkSpaceLayout *next, *prev;
-
- struct bScreen *screen;
- /* The name of this layout, we override the RNA name of the screen with this (but not ID name itself) */
- char name[64]; /* MAX_NAME */
-} WorkSpaceLayout;
-
-typedef struct WorkSpace {
- ID id;
-
- ListBase layouts; /* WorkSpaceLayout */
- /* Store for each hook (so for each window) which layout has
- * been activated the last time this workspace was visible. */
- ListBase hook_layout_relations; /* WorkSpaceDataRelation */
-
- int object_mode; /* enum ObjectMode */
- int pad;
-
- struct SceneLayer *render_layer;
-} WorkSpace;
-
-/**
- * Generic (and simple/primitive) struct for storing a history of assignments/relations
- * of workspace data to non-workspace data in a listbase inside the workspace.
- *
- * Using this we can restore the old state of a workspace if the user switches back to it.
- *
- * Usage
- * =====
- * When activating a workspace, it should activate the screen-layout that was active in that
- * workspace before *in this window*.
- * More concretely:
- * * There are two windows, win1 and win2.
- * * Both show workspace ws1, but both also had workspace ws2 activated at some point before.
- * * Last time ws2 was active in win1, screen-layout sl1 was activated.
- * * Last time ws2 was active in win2, screen-layout sl2 was activated.
- * * When changing from ws1 to ws2 in win1, screen-layout sl1 should be activated again.
- * * When changing from ws1 to ws2 in win2, screen-layout sl2 should be activated again.
- * So that means we have to store the active screen-layout in a per workspace, per window
- * relation. This struct is used to store an active screen-layout for each window within the
- * workspace.
- * To find the screen-layout to activate for this window-workspace combination, simply lookup
- * the WorkSpaceDataRelation with the workspace-hook of the window set as parent.
- */
-typedef struct WorkSpaceDataRelation {
- struct WorkSpaceDataRelation *next, *prev;
-
- /* the data used to identify the relation (e.g. to find screen-layout (= value) from/for a hook) */
- void *parent;
- /* The value for this parent-data/workspace relation */
- void *value;
-} WorkSpaceDataRelation;
-
-/**
- * Little wrapper to store data that is going to be per window, but comming from the workspace.
- * It allows us to keep workspace and window data completely separate.
- */
-typedef struct WorkSpaceInstanceHook {
- WorkSpace *active;
- WorkSpace *temp_store;
-
- struct WorkSpaceLayout *act_layout;
- struct WorkSpaceLayout *temp_layout_store; /* temporary when switching screens */
-} WorkSpaceInstanceHook;
-
-#endif /* __DNA_WORKSPACE_TYPES_H__ */
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 9ad781ab700..33f7a2ecb4d 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -247,7 +247,6 @@ static void wm_window_match_do(bContext *C, ListBase *oldwmlist)
bScreen *screen = NULL;
/* when loading without UI, no matching needed */
- /* XXX think we don't handle this correctly yet, it's activating workspace from old file */
if (!(G.fileflags & G_FILE_NO_UI) && (screen = CTX_wm_screen(C))) {
/* match oldwm to new dbase, only old files */
More information about the Bf-blender-cvs
mailing list