[Bf-blender-cvs] [739d3bc534f] topbar: Don't write topbar data into files (yet)

[Julian Eisel]

Commit: 739d3bc534f000ecd98a095dfb26ef3e3b8abd94
Author: Julian Eisel
Date:   Thu Apr 19 11:00:56 2018 +0200
Branches: topbar
https://developer.blender.org/rB739d3bc534f000ecd98a095dfb26ef3e3b8abd94

Don't write topbar data into files (yet)

We decided to do this so we don't have to care much about compatibility. The
code for writing is just #ifdef'ed out so it can easily be brought back.

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

M	source/blender/blenloader/intern/writefile.c
M	source/blender/makesdna/DNA_space_types.h

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

diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 394513f9cba..0f7a4b7e6ae 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2922,9 +2922,11 @@ static void write_area_regions(WriteData *wd, ScrArea *area)
 			}
 			writestruct(wd, DATA, SpaceConsole, 1, sl);
 		}
+#ifdef WITH_TOPAR_WRITING
 		else if (sl->spacetype == SPACE_TOPBAR) {
 			writestruct(wd, DATA, SpaceTopBar, 1, sl);
 		}
+#endif
 		else if (sl->spacetype == SPACE_USERPREF) {
 			writestruct(wd, DATA, SpaceUserPref, 1, sl);
 		}
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 1849d6d604f..917b5d67152 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -71,6 +71,9 @@ struct BLI_mempool;
  * Editor toolshelf. Leaving this ifdef'ed out for until new tool system and
  * topbar design is more clear. */
 #define WITH_REDO_REGION_REMOVAL
+/* TODO 2.8: We don't write the topbar to files currently. Uncomment this
+ * define to enable writing (should become the default in a bit). */
+//#define WITH_TOPAR_WRITING
 
 
 /* SpaceLink (Base) ==================================== */
@@ -1399,6 +1402,10 @@ typedef enum eSpaceClip_GPencil_Source {
 
 /* Top Bar ======================================= */
 
+/* These two lines with # tell makesdna this struct can be excluded.
+ * Should be: #ifndef WITH_TOPAR_WRITING */
+//#
+//#
 typedef struct SpaceTopBar {
 	SpaceLink *next, *prev;
 	ListBase regionbase;        /* storage of regions for inactive spaces */