Revision: 56081
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56081
Author: campbellbarton
Date: 2013-04-16 05:59:48 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
code cleanup: use BKE naming conventions for functions in BKE_editmesh.h and
BKE_editmesh_bvh.h
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_editmesh.h
trunk/blender/source/blender/blenkernel/BKE_editmesh_bvh.h
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/editmesh.c
trunk/blender/source/blender/blenkernel/intern/editmesh_bvh.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
trunk/blender/source/blender/editors/mesh/editmesh_add.c
trunk/blender/source/blender/editors/mesh/editmesh_bevel.c
trunk/blender/source/blender/editors/mesh/editmesh_extrude.c
trunk/blender/source/blender/editors/mesh/editmesh_inset.c
trunk/blender/source/blender/editors/mesh/editmesh_knife.c
trunk/blender/source/blender/editors/mesh/editmesh_knife_project.c
trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c
trunk/blender/source/blender/editors/mesh/editmesh_rip.c
trunk/blender/source/blender/editors/mesh/editmesh_select.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/mesh/editmesh_utils.c
trunk/blender/source/blender/editors/mesh/mesh_data.c
trunk/blender/source/blender/editors/mesh/mesh_navmesh.c
trunk/blender/source/blender/editors/mesh/mesh_ops.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/object/object_hook.c
trunk/blender/source/blender/editors/object/object_modifier.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/render/render_shading.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c
trunk/blender/source/blender/editors/space_image/image_edit.c
trunk/blender/source/blender/editors/space_info/info_stats.c
trunk/blender/source/blender/editors/space_view3d/view3d_header.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/transform/transform_manipulator.c
trunk/blender/source/blender/editors/transform/transform_ops.c
trunk/blender/source/blender/editors/transform/transform_orientations.c
trunk/blender/source/blender/editors/transform/transform_snap.c
trunk/blender/source/blender/editors/uvedit/uvedit_buttons.c
trunk/blender/source/blender/editors/uvedit/uvedit_draw.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
trunk/blender/source/blender/makesdna/DNA_mesh_types.h
trunk/blender/source/blender/makesrna/intern/rna_object.c
Modified: trunk/blender/source/blender/blenkernel/BKE_editmesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_editmesh.h 2013-04-16
05:46:17 UTC (rev 56080)
+++ trunk/blender/source/blender/blenkernel/BKE_editmesh.h 2013-04-16
05:59:48 UTC (rev 56081)
@@ -30,7 +30,6 @@
struct BMLoop;
struct BMFace;
struct Mesh;
-struct DerivedMesh;
/* ok: the EDBM module is for editmode bmesh stuff. in contrast, the
* BMEdit module is for code shared with blenkernel that concerns
@@ -84,11 +83,11 @@
int mirror_cdlayer; /* -1 is invalid */
} BMEditMesh;
-void BMEdit_RecalcTessellation(BMEditMesh *em);
-BMEditMesh *BMEdit_Create(BMesh *bm, const bool do_tessellate);
-BMEditMesh *BMEdit_Copy(BMEditMesh *em);
-BMEditMesh *BMEdit_FromObject(struct Object *ob);
-void BMEdit_Free(BMEditMesh *em);
-void BMEdit_UpdateLinkedCustomData(BMEditMesh *em);
+void BKE_editmesh_tessface_calc(BMEditMesh *em);
+BMEditMesh *BKE_editmesh_create(BMesh *bm, const bool do_tessellate);
+BMEditMesh *BKE_editmesh_copy(BMEditMesh *em);
+BMEditMesh *BKE_editmesh_from_object(struct Object *ob);
+void BKE_editmesh_free(BMEditMesh *em);
+void BKE_editmesh_update_linked_customdata(BMEditMesh *em);
#endif /* __BKE_EDITMESH_H__ */
Modified: trunk/blender/source/blender/blenkernel/BKE_editmesh_bvh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_editmesh_bvh.h 2013-04-16
05:46:17 UTC (rev 56080)
+++ trunk/blender/source/blender/blenkernel/BKE_editmesh_bvh.h 2013-04-16
05:59:48 UTC (rev 56081)
@@ -34,27 +34,22 @@
struct BMEditMesh;
struct BMFace;
-struct BMEdge;
struct BMVert;
-struct RegionView3D;
struct BMBVHTree;
struct BVHTree;
struct Scene;
-struct Object;
typedef struct BMBVHTree BMBVHTree;
-BMBVHTree *BMBVH_NewBVH(struct BMEditMesh *em, int flag, struct Scene *scene);
-void BMBVH_FreeBVH(BMBVHTree *tree);
-struct BVHTree *BMBVH_BVHTree(BMBVHTree *tree);
+BMBVHTree *BKE_bmbvh_new(struct BMEditMesh *em, int flag, struct Scene
*scene);
+void BKE_bmbvh_free(BMBVHTree *tree);
+struct BVHTree *BKE_bmbvh_tree_get(BMBVHTree *tree);
+struct BMFace *BKE_bmbvh_ray_cast(BMBVHTree *tree, const float co[3], const
float dir[3],
+ float r_hitout[3], float r_cagehit[3]);
+/* find a vert closest to co in a sphere of radius maxdist */
+struct BMVert *BKE_bmbvh_find_vert_closest(BMBVHTree *tree, const float
co[3], const float maxdist);
-struct BMFace *BMBVH_RayCast(BMBVHTree *tree, const float co[3], const float
dir[3],
- float r_hitout[3], float r_cagehit[3]);
-
-/*find a vert closest to co in a sphere of radius maxdist*/
-struct BMVert *BMBVH_FindClosestVert(BMBVHTree *tree, const float co[3], const
float maxdist);
-
-/* BMBVH_NewBVH flag parameter */
+/* BKE_bmbvh_new flag parameter */
enum {
BMBVH_USE_CAGE = 1, /* project geometry onto modifier cage */
BMBVH_RETURN_ORIG = 2, /* use with BMBVH_USE_CAGE, returns hits in
relation to original geometry */
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2013-04-16 05:46:17 UTC (rev 56080)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2013-04-16 05:59:48 UTC (rev 56081)
@@ -1198,7 +1198,7 @@
void DM_update_weight_mcol(Object *ob, DerivedMesh *dm, int const draw_flag,
float *weights, int num, const int *indices)
{
- BMEditMesh *em = (dm->type == DM_TYPE_EDITBMESH) ?
BMEdit_FromObject(ob) : NULL;
+ BMEditMesh *em = (dm->type == DM_TYPE_EDITBMESH) ?
BKE_editmesh_from_object(ob) : NULL;
unsigned char (*wtcol_v)[4];
int numVerts = dm->getNumVerts(dm);
int i;
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2013-04-16
05:46:17 UTC (rev 56080)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2013-04-16
05:59:48 UTC (rev 56081)
@@ -964,7 +964,7 @@
/* simple preventing of too deep nested groups */
if (level > MAX_DUPLI_RECUR) return;
- em = BMEdit_FromObject(par);
+ em = BKE_editmesh_from_object(par);
/* get derived mesh */
dm_mask = CD_MASK_BAREMESH;
@@ -1091,7 +1091,7 @@
if (level > MAX_DUPLI_RECUR) return;
copy_m4_m4(pmat, par->obmat);
- em = BMEdit_FromObject(par);
+ em = BKE_editmesh_from_object(par);
/* get derived mesh */
dm_mask = CD_MASK_BAREMESH;
Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c 2013-04-16
05:46:17 UTC (rev 56080)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2013-04-16
05:59:48 UTC (rev 56081)
@@ -350,7 +350,7 @@
static void contarget_get_mesh_mat(Object *ob, const char *substring, float
mat[4][4])
{
DerivedMesh *dm = NULL;
- BMEditMesh *em = BMEdit_FromObject(ob);
+ BMEditMesh *em = BKE_editmesh_from_object(ob);
float vec[3] = {0.0f, 0.0f, 0.0f};
float normal[3] = {0.0f, 0.0f, 0.0f}, plane[3];
float imat[3][3], tmat[3][3];
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
2013-04-16 05:46:17 UTC (rev 56080)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
2013-04-16 05:59:48 UTC (rev 56081)
@@ -1538,7 +1538,7 @@
* \note this function assumes this is a mesh object,
* don't add NULL data check here. caller must do that
*/
-BMEditMesh *BMEdit_FromObject(Object *ob)
+BMEditMesh *BKE_editmesh_from_object(Object *ob)
{
BLI_assert(ob->type == OB_MESH);
/* sanity check */
Modified: trunk/blender/source/blender/blenkernel/intern/editmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editmesh.c 2013-04-16
05:46:17 UTC (rev 56080)
+++ trunk/blender/source/blender/blenkernel/intern/editmesh.c 2013-04-16
05:59:48 UTC (rev 56081)
@@ -39,19 +39,19 @@
#include "BLI_scanfill.h"
-BMEditMesh *BMEdit_Create(BMesh *bm, const bool do_tessellate)
+BMEditMesh *BKE_editmesh_create(BMesh *bm, const bool do_tessellate)
{
BMEditMesh *em = MEM_callocN(sizeof(BMEditMesh), __func__);
em->bm = bm;
if (do_tessellate) {
- BMEdit_RecalcTessellation(em);
+ BKE_editmesh_tessface_calc(em);
}
return em;
}
-BMEditMesh *BMEdit_Copy(BMEditMesh *em)
+BMEditMesh *BKE_editmesh_copy(BMEditMesh *em)
{
BMEditMesh *em_copy = MEM_callocN(sizeof(BMEditMesh), __func__);
*em_copy = *em;
@@ -77,7 +77,7 @@
return em_copy;
}
-static void BMEdit_RecalcTessellation_intern(BMEditMesh *em)
+static void editmesh_tessface_calc_intern(BMEditMesh *em)
{
/* use this to avoid locking pthread for _every_ polygon
* and calling the fill function */
@@ -249,9 +249,9 @@
}
-void BMEdit_RecalcTessellation(BMEditMesh *em)
+void BKE_editmesh_tessface_calc(BMEditMesh *em)
{
- BMEdit_RecalcTessellation_intern(em);
+ editmesh_tessface_calc_intern(em);
/* commented because editbmesh_build_data() ensures we get tessfaces */
#if 0
@@ -268,7 +268,7 @@
#endif
}
-void BMEdit_UpdateLinkedCustomData(BMEditMesh *em)
+void BKE_editmesh_update_linked_customdata(BMEditMesh *em)
{
BMesh *bm = em->bm;
int act;
@@ -289,7 +289,7 @@
}
/*does not free the BMEditMesh struct itself*/
-void BMEdit_Free(BMEditMesh *em)
+void BKE_editmesh_free(BMEditMesh *em)
{
if (em->derivedFinal) {
if (em->derivedFinal != em->derivedCage) {
Modified: trunk/blender/source/blender/blenkernel/intern/editmesh_bvh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editmesh_bvh.c
2013-04-16 05:46:17 UTC (rev 56080)
+++ trunk/blender/source/blender/blenkernel/intern/editmesh_bvh.c
2013-04-16 05:59:48 UTC (rev 56081)
@@ -75,7 +75,7 @@
}
}
-BMBVHTree *BMBVH_NewBVH(BMEditMesh *em, int flag, struct Scene *scene)
+BMBVHTree *BKE_bmbvh_new(BMEditMesh *em, int flag, struct Scene *scene)
{
BMBVHTree *tree = MEM_callocN(sizeof(*tree), "BMBVHTree");
DerivedMesh *cage, *final;
@@ -88,7 +88,7 @@
* so that e.g. mirror or array use original vertex coordinates and not
mirrored or duplicate */
BLI_smallhash_init(&shash);
- BMEdit_RecalcTessellation(em);
+ BKE_editmesh_tessface_calc(em);
tree->ob = em->ob;
tree->scene = scene;
@@ -180,7 +180,7 @@
return tree;
}
-void BMBVH_FreeBVH(BMBVHTree *tree)
+void BKE_bmbvh_free(BMBVHTree *tree)
{
BLI_bvhtree_free(tree->tree);
@@ -232,8 +232,8 @@
}
}
-BMFace *BMBVH_RayCast(BMBVHTree *tree, const float co[3], const float dir[3],
- float r_hitout[3], float r_cagehit[3])
+BMFace *BKE_bmbvh_ray_cast(BMBVHTree *tree, const float co[3], const float
dir[3],
+ float r_hitout[3], float r_cagehit[3])
{
BVHTreeRayHit hit;
@@ -273,7 +273,7 @@
return NULL;
}
-BVHTree *BMBVH_BVHTree(BMBVHTree *tree)
+BVHTree *BKE_bmbvh_tree_get(BMBVHTree *tree)
{
return tree->tree;
}
@@ -300,7 +300,7 @@
}
}
-BMVert *BMBVH_FindClosestVert(BMBVHTree *tree, const float co[3], const float
maxdist)
+BMVert *BKE_bmbvh_find_vert_closest(BMBVHTree *tree, const float co[3], const
float maxdist)
{
BVHTreeNearest hit;
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2013-04-16
05:46:17 UTC (rev 56080)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2013-04-16
05:59:48 UTC (rev 56081)
@@ -351,7 +351,7 @@
static void mesh_update_linked_customdata(Mesh *me, const bool
do_ensure_tess_cd)
{
if (me->edit_btmesh)
- BMEdit_UpdateLinkedCustomData(me->edit_btmesh);
+ BKE_editmesh_update_linked_customdata(me->edit_btmesh);
if (do_ensure_tess_cd) {
mesh_ensure_tessellation_customdata(me);
Modified: trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
2013-04-16 05:46:17 UTC (rev 56080)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
