Cleanup: Rename `BKE_library_idmap` file to `BKE_main_idmap`
authorBastien Montagne <b.mont29@gmail.com>
Fri, 7 Feb 2020 15:29:02 +0000 (16:29 +0100)
committerBastien Montagne <b.mont29@gmail.com>
Fri, 7 Feb 2020 15:29:02 +0000 (16:29 +0100)
Part of T72604:
> Proposal: BKE_library and BKE_main API naming: prefixes conventions

source/blender/blenkernel/BKE_main_idmap.h [moved from source/blender/blenkernel/BKE_library_idmap.h with 94% similarity]
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/main_idmap.c [moved from source/blender/blenkernel/intern/library_idmap.c with 99% similarity]
source/blender/blenloader/intern/readfile.c

similarity index 94%
rename from source/blender/blenkernel/BKE_library_idmap.h
rename to source/blender/blenkernel/BKE_main_idmap.h
index 0285699dea32014d5ed0aa17c98c6adf7553fb23..d95f32b162abac9230caadd1d8709eb979c1c63a 100644 (file)
@@ -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_IDMAP_H__
-#define __BKE_LIBRARY_IDMAP_H__
+#ifndef __BKE_MAIN_IDMAP_H__
+#define __BKE_MAIN_IDMAP_H__
 
 /** \file
  * \ingroup bke
@@ -42,4 +42,4 @@ struct ID *BKE_main_idmap_lookup_id(struct IDNameLib_Map *id_typemap,
                                     const struct ID *id) ATTR_WARN_UNUSED_RESULT
     ATTR_NONNULL(1, 2);
 
-#endif /* __BKE_LIBRARY_IDMAP_H__ */
+#endif /* __BKE_MAIN_IDMAP_H__ */
index 0aa4f0fe677ef0866f29d553560db892949066fd..2f839aafa2c37649484870a16e26a892b0e154d8 100644 (file)
@@ -136,7 +136,6 @@ set(SRC
   intern/layer.c
   intern/layer_utils.c
   intern/library.c
-  intern/library_idmap.c
   intern/library_override.c
   intern/library_query.c
   intern/library_remap.c
@@ -144,6 +143,7 @@ set(SRC
   intern/lightprobe.c
   intern/linestyle.c
   intern/main.c
+  intern/main_idmap.c
   intern/mask.c
   intern/mask_evaluate.c
   intern/mask_rasterize.c
@@ -299,7 +299,6 @@ set(SRC
   BKE_lattice.h
   BKE_layer.h
   BKE_library.h
-  BKE_library_idmap.h
   BKE_library_override.h
   BKE_library_query.h
   BKE_library_remap.h
@@ -307,6 +306,7 @@ set(SRC
   BKE_lightprobe.h
   BKE_linestyle.h
   BKE_main.h
+  BKE_main_idmap.h
   BKE_mask.h
   BKE_material.h
   BKE_mball.h
similarity index 99%
rename from source/blender/blenkernel/intern/library_idmap.c
rename to source/blender/blenkernel/intern/main_idmap.c
index ab0ff5b0096621e814d81e1bfa94c478c0571cc2..a210961b21285563d6b03029fe5e9f5207e03c26 100644 (file)
@@ -26,8 +26,8 @@
 #include "DNA_ID.h"
 
 #include "BKE_idcode.h"
-#include "BKE_library_idmap.h" /* own include */
 #include "BKE_main.h"
+#include "BKE_main_idmap.h" /* own include */
 
 /** \file
  * \ingroup bke
index 9547e4cd05aadcc6803cf26f3939b6ba11a13661..2ad79b4e252ddf078e218aef075cb822af8e742e 100644 (file)
 #include "BKE_idprop.h"
 #include "BKE_layer.h"
 #include "BKE_library.h"
-#include "BKE_library_idmap.h"
+#include "BKE_main_idmap.h"
 #include "BKE_library_override.h"
 #include "BKE_library_query.h"
 #include "BKE_main.h"  // for Main