[Bf-blender-cvs] [ddad044cfe1] master: Fix mismatch in BKE headers' multi-include safeguards naming.

[Bastien Montagne]

Commit: ddad044cfe132f6d2367baead8d4bf2ecc68e399
Author: Bastien Montagne
Date:   Mon Feb 10 16:54:24 2020 +0100
Branches: master
https://developer.blender.org/rBddad044cfe132f6d2367baead8d4bf2ecc68e399

Fix mismatch in BKE headers' multi-include safeguards naming.

Forgot to update those in recent `BKE_lib_` files renames.

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

M	source/blender/blenkernel/BKE_lib_id.h
M	source/blender/blenkernel/BKE_lib_override.h
M	source/blender/blenkernel/BKE_lib_query.h
M	source/blender/blenkernel/BKE_lib_remap.h
M	source/blender/blenkernel/intern/lib_intern.h

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

diff --git a/source/blender/blenkernel/BKE_lib_id.h b/source/blender/blenkernel/BKE_lib_id.h
index f3a92fba1fb..2ff2644684a 100644
--- a/source/blender/blenkernel/BKE_lib_id.h
+++ b/source/blender/blenkernel/BKE_lib_id.h
@@ -16,8 +16,8 @@
  * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
  * All rights reserved.
  */
-#ifndef __BKE_LIBRARY_H__
-#define __BKE_LIBRARY_H__
+#ifndef __BKE_LIB_ID_H__
+#define __BKE_LIB_ID_H__
 
 /** \file
  * \ingroup bke
@@ -263,4 +263,4 @@ void BKE_id_reorder(const struct ListBase *lb, struct ID *id, struct ID *relativ
 }
 #endif
 
-#endif /* __BKE_LIBRARY_H__ */
+#endif /* __BKE_LIB_ID_H__ */
diff --git a/source/blender/blenkernel/BKE_lib_override.h b/source/blender/blenkernel/BKE_lib_override.h
index b6db93e1cf0..2c03fbcc550 100644
--- a/source/blender/blenkernel/BKE_lib_override.h
+++ b/source/blender/blenkernel/BKE_lib_override.h
@@ -17,8 +17,8 @@
  * All rights reserved.
  */
 
-#ifndef __BKE_LIBRARY_OVERRIDE_H__
-#define __BKE_LIBRARY_OVERRIDE_H__
+#ifndef __BKE_LIB_OVERRIDE_H__
+#define __BKE_LIB_OVERRIDE_H__
 
 /** \file
  * \ingroup bke
@@ -111,4 +111,4 @@ void BKE_override_library_operations_store_end(OverrideLibraryStorage *override_
                                                struct ID *local);
 void BKE_override_library_operations_store_finalize(OverrideLibraryStorage *override_storage);
 
-#endif /* __BKE_LIBRARY_OVERRIDE_H__ */
+#endif /* __BKE_LIB_OVERRIDE_H__ */
diff --git a/source/blender/blenkernel/BKE_lib_query.h b/source/blender/blenkernel/BKE_lib_query.h
index a0abe4320ed..36aa69bf795 100644
--- a/source/blender/blenkernel/BKE_lib_query.h
+++ b/source/blender/blenkernel/BKE_lib_query.h
@@ -16,8 +16,8 @@
  * The Original Code is Copyright (C) 2014 by Blender Foundation.
  * All rights reserved.
  */
-#ifndef __BKE_LIBRARY_QUERY_H__
-#define __BKE_LIBRARY_QUERY_H__
+#ifndef __BKE_LIB_QUERY_H__
+#define __BKE_LIB_QUERY_H__
 
 /** \file
  * \ingroup bke
@@ -121,4 +121,4 @@ void BKE_library_ID_test_usages(struct Main *bmain,
 void BKE_library_unused_linked_data_set_tag(struct Main *bmain, const bool do_init_tag);
 void BKE_library_indirectly_used_data_tag_clear(struct Main *bmain);
 
-#endif /* __BKE_LIBRARY_QUERY_H__ */
+#endif /* __BKE_LIB_QUERY_H__ */
diff --git a/source/blender/blenkernel/BKE_lib_remap.h b/source/blender/blenkernel/BKE_lib_remap.h
index 0f39060f2f9..6105662c5d3 100644
--- a/source/blender/blenkernel/BKE_lib_remap.h
+++ b/source/blender/blenkernel/BKE_lib_remap.h
@@ -13,8 +13,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-#ifndef __BKE_LIBRARY_REMAP_H__
-#define __BKE_LIBRARY_REMAP_H__
+#ifndef __BKE_LIB_REMAP_H__
+#define __BKE_LIB_REMAP_H__
 
 /** \file
  * \ingroup bke
@@ -116,4 +116,4 @@ void BKE_library_callback_remap_editor_id_reference_set(
 }
 #endif
 
-#endif /* __BKE_LIBRARY_REMAP_H__ */
+#endif /* __BKE_LIB_REMAP_H__ */
diff --git a/source/blender/blenkernel/intern/lib_intern.h b/source/blender/blenkernel/intern/lib_intern.h
index c0568bca964..bd5e4a8dfe2 100644
--- a/source/blender/blenkernel/intern/lib_intern.h
+++ b/source/blender/blenkernel/intern/lib_intern.h
@@ -21,8 +21,8 @@
  * \ingroup bke
  */
 
-#ifndef __LIB_ID_INTERN_H__
-#define __LIB_ID_INTERN_H__
+#ifndef __LIB_INTERN_H__
+#define __LIB_INTERN_H__
 
 extern BKE_library_free_window_manager_cb free_windowmanager_cb;
 
@@ -30,4 +30,4 @@ extern BKE_library_free_notifier_reference_cb free_notifier_reference_cb;
 
 extern BKE_library_remap_editor_id_reference_cb remap_editor_id_reference_cb;
 
-#endif /* __LIB_ID_INTERN_H__ */
+#endif /* __LIB_INTERN_H__ */