[Bf-blender-cvs] [2a7b74c2371] master: Cleanup: BLO: move validate code into own header.

[Bastien Montagne]

Commit: 2a7b74c23711a15c4e1946c699161d420a4bee7b
Author: Bastien Montagne
Date:   Fri Jan 25 17:31:32 2019 +0100
Branches: master
https://developer.blender.org/rB2a7b74c23711a15c4e1946c699161d420a4bee7b

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)...

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

A	source/blender/blenloader/BLO_blend_validate.h
M	source/blender/blenloader/BLO_writefile.h
M	source/blender/blenloader/CMakeLists.txt
M	source/blender/blenloader/intern/blend_validate.c
M	source/blender/blenloader/intern/readfile.c
M	source/blender/blenloader/intern/writefile.c
M	source/blender/editors/undo/ed_undo.c

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

diff --git a/source/blender/blenloader/BLO_writefile.h b/source/blender/blenloader/BLO_blend_validate.h
similarity index 70%
copy from source/blender/blenloader/BLO_writefile.h
copy to source/blender/blenloader/BLO_blend_validate.h
index d615514f081..f9731e19475 100644
--- a/source/blender/blenloader/BLO_writefile.h
+++ b/source/blender/blenloader/BLO_blend_validate.h
@@ -25,25 +25,17 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef __BLO_WRITEFILE_H__
-#define __BLO_WRITEFILE_H__
+#ifndef __BLO_BLEND_VALIDATE_H__
+#define __BLO_BLEND_VALIDATE_H__
 
-/** \file BLO_writefile.h
+/** \file BLO_blend_validate.h
  *  \ingroup blenloader
- *  \brief external writefile function prototypes.
+ *  \brief Utils ensuring .blend file (i.e. Main) is in valid state during write and/or read process.
  */
 
-struct BlendThumbnail;
-struct MemFile;
 struct Main;
 struct ReportList;
 
-extern bool BLO_write_file(
-        struct Main *mainvar, const char *filepath, int write_flags,
-        struct ReportList *reports, const struct BlendThumbnail *thumb);
-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/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"