[Bf-blender-cvs] [90c1426870e] topbar: Fix typo in #define
Julian Eisel
noreply at git.blender.org
Thu Apr 19 15:25:43 CEST 2018
Commit: 90c1426870ec026f7cb1875e781cf953e90e874a
Author: Julian Eisel
Date: Thu Apr 19 15:25:16 2018 +0200
Branches: topbar
https://developer.blender.org/rB90c1426870ec026f7cb1875e781cf953e90e874a
Fix typo in #define
===================================================================
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 11edb6b4bdf..4d2cd2e9f8c 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2922,7 +2922,7 @@ static void write_area_regions(WriteData *wd, ScrArea *area)
}
writestruct(wd, DATA, SpaceConsole, 1, sl);
}
-#ifdef WITH_TOPAR_WRITING
+#ifdef WITH_TOPBAR_WRITING
else if (sl->spacetype == SPACE_TOPBAR) {
writestruct(wd, DATA, SpaceTopBar, 1, sl);
}
@@ -2963,7 +2963,7 @@ static void write_windowmanager(WriteData *wd, wmWindowManager *wm)
writestruct(wd, DATA, WorkSpaceInstanceHook, 1, win->workspace_hook);
writestruct(wd, DATA, Stereo3dFormat, 1, win->stereo3d_format);
-#ifdef WITH_TOPAR_WRITING
+#ifdef WITH_TOPBAR_WRITING
write_area_map(wd, &win->global_areas);
#endif
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 50cd6291b88..f5758492c85 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -73,7 +73,7 @@ struct BLI_mempool;
//#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
+//#define WITH_TOPBAR_WRITING
/* SpaceLink (Base) ==================================== */
@@ -1403,7 +1403,7 @@ typedef enum eSpaceClip_GPencil_Source {
/* Top Bar ======================================= */
/* These two lines with # tell makesdna this struct can be excluded.
- * Should be: #ifndef WITH_TOPAR_WRITING */
+ * Should be: #ifndef WITH_TOPBAR_WRITING */
//#
//#
typedef struct SpaceTopBar {
More information about the Bf-blender-cvs
mailing list