From 2a7b74c23711a15c4e1946c699161d420a4bee7b Mon Sep 17 00:00:00 2001
From: Bastien Montagne <montagne29@wanadoo.fr>
Date: Fri, 25 Jan 2019 17:31:32 +0100
Subject: Cleanup: BLO: move validate code into own header.

Does not make sense to keep that with BLO_writefile.h, this can also be
used by read code, and some other parts of Blender (like ed_undo.c
currently)...
---
 source/blender/blenloader/BLO_blend_validate.h    | 41 +++++++++++++++++++++++
 source/blender/blenloader/BLO_writefile.h         |  2 --
 source/blender/blenloader/CMakeLists.txt          |  1 +
 source/blender/blenloader/intern/blend_validate.c |  2 +-
 source/blender/blenloader/intern/readfile.c       |  2 +-
 source/blender/blenloader/intern/writefile.c      |  5 +--
 source/blender/editors/undo/ed_undo.c             |  2 +-
 7 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 source/blender/blenloader/BLO_blend_validate.h

(limited to 'source/blender')

diff --git a/source/blender/blenloader/BLO_blend_validate.h b/source/blender/blenloader/BLO_blend_validate.h
new file mode 100644
index 00000000000..f9731e19475
--- /dev/null
+++ b/source/blender/blenloader/BLO_blend_validate.h
@@ -0,0 +1,41 @@
+/*
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef __BLO_BLEND_VALIDATE_H__
+#define __BLO_BLEND_VALIDATE_H__
+
+/** \file BLO_blend_validate.h
+ *  \ingroup blenloader
+ *  \brief Utils ensuring .blend file (i.e. Main) is in valid state during write and/or read process.
+ */
+
+struct Main;
+struct ReportList;
+
+bool BLO_main_validate_libraries(struct Main *bmain, struct ReportList *reports);
+
+#endif
diff --git a/source/blender/blenloader/BLO_writefile.h b/source/blender/blenloader/BLO_writefile.h
index d615514f081..f6d0be6f5f0 100644
--- a/source/blender/blenloader/BLO_writefile.h
+++ b/source/blender/blenloader/BLO_writefile.h
@@ -44,6 +44,4 @@ extern bool BLO_write_file(
 extern bool BLO_write_file_mem(
         struct Main *mainvar, struct MemFile *compare, struct MemFile *current, int write_flags);
 
-bool BLO_main_validate_libraries(struct Main *bmain, struct ReportList *reports);
-
 #endif
diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt
index 49987cb860c..2a3566bc2c3 100644
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -64,6 +64,7 @@ set(SRC
 	intern/writefile.c
 
 	BLO_blend_defs.h
+	BLO_blend_validate.h
 	BLO_readfile.h
 	BLO_undofile.h
 	BLO_writefile.h
diff --git a/source/blender/blenloader/intern/blend_validate.c b/source/blender/blenloader/intern/blend_validate.c
index 07d0379553d..a5d53657152 100644
--- a/source/blender/blenloader/intern/blend_validate.c
+++ b/source/blender/blenloader/intern/blend_validate.c
@@ -46,8 +46,8 @@
 #include "BKE_main.h"
 #include "BKE_report.h"
 
+#include "BLO_blend_validate.h"
 #include "BLO_readfile.h"
-#include "BLO_writefile.h"
 
 #include "readfile.h"
 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 71addb526be..92e5f34c06f 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -171,9 +171,9 @@
 #include "NOD_common.h"
 #include "NOD_socket.h"
 
+#include "BLO_blend_defs.h"
 #include "BLO_readfile.h"
 #include "BLO_undofile.h"
-#include "BLO_blend_defs.h"
 
 #include "RE_engine.h"
 
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index fcd19c2ca0f..2e621ab9330 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -188,10 +188,11 @@
 #endif
 
 
-#include "BLO_writefile.h"
+#include "BLO_blend_defs.h"
+#include "BLO_blend_validate.h"
 #include "BLO_readfile.h"
 #include "BLO_undofile.h"
-#include "BLO_blend_defs.h"
+#include "BLO_writefile.h"
 
 #include "readfile.h"
 
diff --git a/source/blender/editors/undo/ed_undo.c b/source/blender/editors/undo/ed_undo.c
index 337ad1d514a..6f39be0f7c6 100644
--- a/source/blender/editors/undo/ed_undo.c
+++ b/source/blender/editors/undo/ed_undo.c
@@ -56,7 +56,7 @@
 #include "BKE_workspace.h"
 #include "BKE_paint.h"
 
-#include "BLO_writefile.h"
+#include "BLO_blend_validate.h"
 
 #include "ED_gpencil.h"
 #include "ED_render.h"
-- 
cgit v1.2.3