[Bf-blender-cvs] [44b99ba9b0b] custom-manipulators: Rename object_fmap -> object_facemap_ops

[Campbell Barton]

Commit: 44b99ba9b0bbeee7e2c6e0c0e74789fbea64c01f
Author: Campbell Barton
Date:   Tue May 30 17:23:13 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB44b99ba9b0bbeee7e2c6e0c0e74789fbea64c01f

Rename object_fmap -> object_facemap_ops

Also ED_fmap -> ED_object_facemap

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

M	source/blender/blenloader/intern/readfile.c
M	source/blender/editors/include/ED_mesh.h
M	source/blender/editors/object/CMakeLists.txt
R098	source/blender/editors/object/object_fmap.c	source/blender/editors/object/object_facemap_ops.c
M	source/blender/makesrna/intern/rna_object.c
M	source/blenderplayer/bad_level_call_stubs/stubs.c

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 8c649afbf0d..7845cd6aed6 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -138,7 +138,6 @@
 #include "BKE_multires.h"
 #include "BKE_node.h" // for tree type defines
 #include "BKE_object.h"
-#include "BKE_object_facemap.h"
 #include "BKE_paint.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h
index 42ac2aca2c5..f9eae703bcc 100644
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@ -261,9 +261,9 @@ float                ED_vgroup_vert_weight(struct Object *ob, struct bDeformGrou
 void                 ED_vgroup_vert_active_mirror(struct Object *ob, int def_nr);
 
 
-/* object_fmap.c */
-void ED_fmap_face_add(struct Object *ob, struct bFaceMap *fmap, int facenum);
-void ED_fmap_face_remove(struct Object *ob, struct bFaceMap *fmap, int facenum);
+/* object_facemap_ops.c */
+void ED_object_facemap_face_add(struct Object *ob, struct bFaceMap *fmap, int facenum);
+void ED_object_facemap_face_remove(struct Object *ob, struct bFaceMap *fmap, int facenum);
 
 /* mesh_data.c */
 // void ED_mesh_geometry_add(struct Mesh *mesh, struct ReportList *reports, int verts, int edges, int faces);
diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt
index a8cd8fdd225..8050508983b 100644
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -47,7 +47,7 @@ set(SRC
 	object_bake_api.c
 	object_constraint.c
 	object_edit.c
-	object_fmap.c
+	object_facemap_ops.c
 	object_group.c
 	object_hook.c
 	object_lattice.c
diff --git a/source/blender/editors/object/object_fmap.c b/source/blender/editors/object/object_facemap_ops.c
similarity index 98%
rename from source/blender/editors/object/object_fmap.c
rename to source/blender/editors/object/object_facemap_ops.c
index d67eb3b3ef7..b8666fc7a65 100644
--- a/source/blender/editors/object/object_fmap.c
+++ b/source/blender/editors/object/object_facemap_ops.c
@@ -58,7 +58,7 @@
 #include "object_intern.h"
 
 /* called while not in editmode */
-void ED_fmap_face_add(Object *ob, bFaceMap *fmap, int facenum)
+void ED_object_facemap_face_add(Object *ob, bFaceMap *fmap, int facenum)
 {
 	int fmap_nr;
 	if (GS(((ID *)ob->data)->name) != ID_ME)
@@ -80,7 +80,7 @@ void ED_fmap_face_add(Object *ob, bFaceMap *fmap, int facenum)
 }
 
 /* called while not in editmode */
-void ED_fmap_face_remove(Object *ob, bFaceMap *fmap, int facenum)
+void ED_object_facemap_face_remove(Object *ob, bFaceMap *fmap, int facenum)
 {
 	int fmap_nr;
 	if (GS(((ID *)ob->data)->name) != ID_ME)
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index a935715d031..a6591e8c3d2 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -1577,7 +1577,7 @@ static void rna_FaceMap_face_add(ID *id, bFaceMap *fmap, ReportList *reports, in
 	}
 
 	while (index_len--)
-		ED_fmap_face_add(ob, fmap, *index++);
+		ED_object_facemap_face_add(ob, fmap, *index++);
 
 	WM_main_add_notifier(NC_GEOM | ND_DATA, (ID *)ob->data);
 }
@@ -1592,7 +1592,7 @@ static void rna_FaceMap_face_remove(ID *id, bFaceMap *fmap, ReportList *reports,
 	}
 
 	while (index_len--)
-		ED_fmap_face_remove(ob, fmap, *index++);
+		ED_object_facemap_face_remove(ob, fmap, *index++);
 
 	WM_main_add_notifier(NC_GEOM | ND_DATA, (ID *)ob->data);
 }
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 3abb31b7a95..ee15f225828 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -543,8 +543,8 @@ void ED_object_constraint_tag_update(struct Object *ob, struct bConstraint *con)
 void ED_vgroup_vert_add(struct Object *ob, struct bDeformGroup *dg, int vertnum, float weight, int assignmode) RET_NONE
 void ED_vgroup_vert_remove(struct Object *ob, struct bDeformGroup *dg, int vertnum) RET_NONE
 float ED_vgroup_vert_weight(struct Object *ob, struct bDeformGroup *dg, int vertnum) RET_ZERO
-void ED_fmap_face_add(struct Object *ob, struct bFaceMap *fmap, int facenum) RET_NONE
-void ED_fmap_face_remove(struct Object *ob, struct bFaceMap *fmap, int facenum) RET_NONE
+void ED_object_facemap_face_add(struct Object *ob, struct bFaceMap *fmap, int facenum) RET_NONE
+void ED_object_facemap_face_remove(struct Object *ob, struct bFaceMap *fmap, int facenum) RET_NONE
 int ED_mesh_mirror_topo_table(struct Object *ob, struct DerivedMesh *dm, char mode) RET_ZERO
 int ED_mesh_mirror_spatial_table(struct Object *ob, struct BMEditMesh *em, struct DerivedMesh *dm, const float co[3], char mode) RET_ZERO