[Bf-blender-cvs] [2ff8039] workspaces: Properly append screens with workspaces

[Julian Eisel]

Commit: 2ff803992c29942fa962ed9b00a6c04730920c31
Author: Julian Eisel
Date:   Wed Jan 4 01:10:45 2017 +0100
Branches: workspaces
https://developer.blender.org/rB2ff803992c29942fa962ed9b00a6c04730920c31

Properly append screens with workspaces

Meaning screen data is now fully editable when appending a screen(-layout) indirectly by appending a workspace. Screens aren't visible while browsing inside .blend files, don't think we need/want that.

===================================================================

M	source/blender/blenkernel/intern/idcode.c
M	source/blender/blenkernel/intern/library.c

===================================================================

diff --git a/source/blender/blenkernel/intern/idcode.c b/source/blender/blenkernel/intern/idcode.c
index 837d863..8c5c4ae 100644
--- a/source/blender/blenkernel/intern/idcode.c
+++ b/source/blender/blenkernel/intern/idcode.c
@@ -86,7 +86,7 @@ static IDType idtypes[] = {
 	{ID_PAL, "Palettes",           "palettes",        BLT_I18NCONTEXT_ID_PALETTE,            true, true  },
 	{ID_PC,  "PaintCurve",         "paint_curves",    BLT_I18NCONTEXT_ID_PAINTCURVE,         true, true  },
 	{ID_SCE, "Scene",              "scenes",          BLT_I18NCONTEXT_ID_SCENE,              true, true  },
-	{ID_SCR, "Screen",             "screens",         BLT_I18NCONTEXT_ID_SCREEN,             false, false},
+	{ID_SCR, "Screen",             "screens",         BLT_I18NCONTEXT_ID_SCREEN,             false, true },
 	{ID_SEQ, "Sequence",           "sequences",       BLT_I18NCONTEXT_ID_SEQUENCE,           false, false}, /* not actually ID data */
 	{ID_SPK, "Speaker",            "speakers",        BLT_I18NCONTEXT_ID_SPEAKER,            true, true  },
 	{ID_SO,  "Sound",              "sounds",          BLT_I18NCONTEXT_ID_SOUND,              true, true  },
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 5c8a087..2d969df 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -466,9 +466,9 @@ bool id_make_local(Main *bmain, ID *id, const bool test, const bool lib_local)
 			if (!test) BKE_cachefile_make_local(bmain, (CacheFile *)id, lib_local);
 			return true;
 		case ID_WS:
-//			if (!test) BKE_workspace_make_local(bmain, (WorkSpace *)id, lib_local);
-			return true;
 		case ID_SCR:
+			/* A bit special: can be appended but not linked. Thus, supporting make-local doesn't make much sense. */
+			return false;
 		case ID_LI:
 		case ID_KE:
 		case ID_WM:
@@ -576,8 +576,6 @@ bool id_copy(Main *bmain, ID *id, ID **newid, bool test)
 			if (!test) *newid = (ID *)BKE_cachefile_copy(bmain, (CacheFile *)id);
 			return true;
 		case ID_WS:
-//			if (!test) *newid = (ID *)BKE_workspace_copy(bmain, (WorkSpace *)id);
-			return true;
 		case ID_SCE:
 		case ID_LI:
 		case ID_SCR: