Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-05-30 18:31:14 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-05-30 18:31:53 +0300
commit272ec8a7cfe671431b7a196fd2b34643512270f8 (patch)
treee4662941434338a504b6b4b1bea370024dba9da4
parentfb27bde1c8059dab781c9d19b80238542de6d3f2 (diff)
Move ED_object_facemap functions into ED_object.h
-rw-r--r--source/blender/editors/include/ED_mesh.h6
-rw-r--r--source/blender/editors/include/ED_object.h5
2 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h
index f9eae703bcc..0ee60471357 100644
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@ -39,7 +39,6 @@ struct ID;
struct View3D;
struct ARegion;
struct bContext;
-struct bFaceMap;
struct wmOperator;
struct wmKeyConfig;
struct ReportList;
@@ -260,11 +259,6 @@ void ED_vgroup_vert_remove(struct Object *ob, struct bDeformGrou
float ED_vgroup_vert_weight(struct Object *ob, struct bDeformGroup *dg, int vertnum);
void ED_vgroup_vert_active_mirror(struct Object *ob, int def_nr);
-
-/* 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);
void ED_mesh_polys_add(struct Mesh *mesh, struct ReportList *reports, int count);
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index f621ee7989d..9e5d55dd031 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -35,6 +35,7 @@
extern "C" {
#endif
+struct bFaceMap;
struct BaseLegacy;
struct EnumPropertyItem;
struct ID;
@@ -221,6 +222,10 @@ struct EnumPropertyItem *ED_object_vgroup_selection_itemf_helper(
void ED_object_check_force_modifiers(struct Main *bmain, struct Scene *scene, struct Object *object);
+/* 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);
+
#ifdef __cplusplus
}
#endif