[Bf-blender-cvs] [42160fd1805] custom-manipulators: Rename facemaps -> object_facemaps
Campbell Barton
noreply at git.blender.org
Tue May 30 08:30:23 CEST 2017
Commit: 42160fd1805c89d7e037eddb038e993840282fac
Author: Campbell Barton
Date: Tue May 30 16:29:43 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB42160fd1805c89d7e037eddb038e993840282fac
Rename facemaps -> object_facemaps
Since face-maps are just a property of objects, like BKE_object_deform.h
===================================================================
R092 source/blender/blenkernel/BKE_facemap.h source/blender/blenkernel/BKE_object_facemap.h
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/object.c
R097 source/blender/blenkernel/intern/facemap.c source/blender/blenkernel/intern/object_facemap.c
M source/blender/blenloader/intern/readfile.c
M source/blender/editors/object/object_fmap.c
M source/blender/makesrna/intern/rna_object.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_facemap.h b/source/blender/blenkernel/BKE_object_facemap.h
similarity index 92%
rename from source/blender/blenkernel/BKE_facemap.h
rename to source/blender/blenkernel/BKE_object_facemap.h
index 1367ef52f2f..12996c9429d 100644
--- a/source/blender/blenkernel/BKE_facemap.h
+++ b/source/blender/blenkernel/BKE_object_facemap.h
@@ -20,10 +20,10 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef __BKE_FACEMAP_H__
-#define __BKE_FACEMAP_H__
+#ifndef __BKE_OBJECT_FACEMAP_H__
+#define __BKE_OBJECT_FACEMAP_H__
-/** \file BKE_facemap.h
+/** \file BKE_object_facemap.h
* \ingroup bke
* \brief Functions for dealing with objects and facemaps.
*/
@@ -51,4 +51,4 @@ void fmap_copy_list(struct ListBase *outbase, struct ListBase *inbase);
}
#endif
-#endif /* __BKE_FACEMAP_H__ */
+#endif /* __BKE_OBJECT_FACEMAP_H__ */
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 2a21e0fe2d9..1ddc6fce818 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -105,7 +105,6 @@ set(SRC
intern/editmesh_bvh.c
intern/editmesh_tangent.c
intern/effect.c
- intern/facemap.c
intern/fcurve.c
intern/fluidsim.c
intern/fmodifier.c
@@ -146,6 +145,7 @@ set(SRC
intern/nla.c
intern/node.c
intern/object.c
+ intern/object_facemap.c
intern/object_deform.c
intern/object_dupli.c
intern/object_update.c
@@ -237,7 +237,6 @@ set(SRC
BKE_editmesh_bvh.h
BKE_editmesh_tangent.h
BKE_effect.h
- BKE_facemap.h
BKE_fcurve.h
BKE_fluidsim.h
BKE_font.h
@@ -273,6 +272,7 @@ set(SRC
BKE_nla.h
BKE_node.h
BKE_object.h
+ BKE_object_facemap.h
BKE_object_deform.h
BKE_ocean.h
BKE_outliner_treehash.h
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 490ce605a9e..ad9a5728e8f 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -85,7 +85,6 @@
#include "BKE_curve.h"
#include "BKE_displist.h"
#include "BKE_effect.h"
-#include "BKE_facemap.h"
#include "BKE_fcurve.h"
#include "BKE_group.h"
#include "BKE_icons.h"
@@ -104,6 +103,7 @@
#include "BKE_multires.h"
#include "BKE_node.h"
#include "BKE_object.h"
+#include "BKE_object_facemap.h"
#include "BKE_object_deform.h"
#include "BKE_paint.h"
#include "BKE_particle.h"
diff --git a/source/blender/blenkernel/intern/facemap.c b/source/blender/blenkernel/intern/object_facemap.c
similarity index 97%
rename from source/blender/blenkernel/intern/facemap.c
rename to source/blender/blenkernel/intern/object_facemap.c
index f586fdc16b6..c2d57f3d499 100644
--- a/source/blender/blenkernel/intern/facemap.c
+++ b/source/blender/blenkernel/intern/object_facemap.c
@@ -25,15 +25,20 @@
* ***** END GPL LICENSE BLOCK *****
*/
+/** \file blender/blenkernel/intern/object_facemap.c
+ * \ingroup bke
+ */
+
+#include <string.h>
#include "DNA_object_types.h"
#include "DNA_mesh_types.h"
#include "BKE_context.h"
#include "BKE_customdata.h"
-#include "BKE_facemap.h"
#include "BKE_editmesh.h"
#include "BKE_object.h"
+#include "BKE_object_facemap.h" /* own include */
#include "BKE_object_deform.h"
#include "BKE_depsgraph.h"
@@ -51,9 +56,6 @@
#include "RNA_define.h"
#include "RNA_access.h"
-#include <string.h>
-
-
static bool fmap_unique_check(void *arg, const char *name)
{
struct {Object *ob; void *fm; } *data = arg;
@@ -238,7 +240,7 @@ void BKE_object_fmap_remove_all(Object *ob)
fmap = next_fmap;
}
}
- /* remove all dverts */
+ /* remove all face-maps */
if (ob->type == OB_MESH) {
Mesh *me = ob->data;
CustomData_free_layer(&me->pdata, CD_FACEMAP, me->totpoly, 0);
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 436c75eae1c..8c649afbf0d 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -122,7 +122,6 @@
#include "BKE_context.h"
#include "BKE_curve.h"
#include "BKE_effect.h"
-#include "BKE_facemap.h"
#include "BKE_fcurve.h"
#include "BKE_global.h" // for G
#include "BKE_group.h"
@@ -139,6 +138,7 @@
#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/object/object_fmap.c b/source/blender/editors/object/object_fmap.c
index 4cc245a4338..d67eb3b3ef7 100644
--- a/source/blender/editors/object/object_fmap.c
+++ b/source/blender/editors/object/object_fmap.c
@@ -33,9 +33,9 @@
#include "BKE_context.h"
#include "BKE_customdata.h"
-#include "BKE_facemap.h"
#include "BKE_editmesh.h"
#include "BKE_object.h"
+#include "BKE_object_facemap.h"
#include "BKE_object_deform.h"
#include "BKE_depsgraph.h"
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 7ce16009f78..667ac8bbb56 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -42,12 +42,12 @@
#include "BLI_utildefines.h"
#include "BLI_listbase.h"
-#include "BKE_facemap.h"
#include "BKE_camera.h"
#include "BKE_paint.h"
#include "BKE_editmesh.h"
#include "BKE_group.h" /* needed for BKE_group_object_exists() */
#include "BKE_object_deform.h"
+#include "BKE_object_facemap.h"
#include "RNA_access.h"
#include "RNA_define.h"
More information about the Bf-blender-cvs
mailing list