[Bf-blender-cvs] [693d8917031] master: Cleanup: used BKE_mesh_ prefix

[Campbell Barton]

Commit: 693d89170315cf62f63c35ecbdeeb4371dc9f733
Author: Campbell Barton
Date:   Mon Nov 25 15:49:25 2019 +1100
Branches: master
https://developer.blender.org/rB693d89170315cf62f63c35ecbdeeb4371dc9f733

Cleanup: used BKE_mesh_ prefix

Missed in recent BKE_remesh renaming.

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

M       source/blender/blenkernel/BKE_mesh_remesh_voxel.h
M       source/blender/blenkernel/intern/mesh_remesh_voxel.c
M       source/blender/editors/object/object_remesh.c

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

diff --git a/source/blender/blenkernel/BKE_mesh_remesh_voxel.h 
b/source/blender/blenkernel/BKE_mesh_remesh_voxel.h
index 86c094b8a6d..a12e94bd416 100644
--- a/source/blender/blenkernel/BKE_mesh_remesh_voxel.h
+++ b/source/blender/blenkernel/BKE_mesh_remesh_voxel.h
@@ -55,6 +55,6 @@ struct Mesh *BKE_mesh_remesh_quadriflow_to_mesh_nomain(struct 
Mesh *mesh,
                                                        void *update_cb_data);
 
 /* Data reprojection functions */
-void BKE_remesh_reproject_paint_mask(struct Mesh *target, struct Mesh *source);
+void BKE_mesh_remesh_reproject_paint_mask(struct Mesh *target, struct Mesh 
*source);
 
 #endif /* __BKE_MESH_REMESH_VOXEL_H__ */
diff --git a/source/blender/blenkernel/intern/mesh_remesh_voxel.c 
b/source/blender/blenkernel/intern/mesh_remesh_voxel.c
index 41546498da0..d616ff30787 100644
--- a/source/blender/blenkernel/intern/mesh_remesh_voxel.c
+++ b/source/blender/blenkernel/intern/mesh_remesh_voxel.c
@@ -316,7 +316,7 @@ Mesh *BKE_mesh_remesh_voxel_to_mesh_nomain(Mesh *mesh,
   return new_mesh;
 }
 
-void BKE_remesh_reproject_paint_mask(Mesh *target, Mesh *source)
+void BKE_mesh_remesh_reproject_paint_mask(Mesh *target, Mesh *source)
 {
   BVHTreeFromMesh bvhtree = {
       .nearest_callback = NULL,
diff --git a/source/blender/editors/object/object_remesh.c 
b/source/blender/editors/object/object_remesh.c
index 1291891a3a2..bfe413ccb91 100644
--- a/source/blender/editors/object/object_remesh.c
+++ b/source/blender/editors/object/object_remesh.c
@@ -142,7 +142,7 @@ static int voxel_remesh_exec(bContext *C, wmOperator *op)
 
   if (mesh->flag & ME_REMESH_REPROJECT_PAINT_MASK) {
     BKE_mesh_runtime_clear_geometry(mesh);
-    BKE_remesh_reproject_paint_mask(new_mesh, mesh);
+    BKE_mesh_remesh_reproject_paint_mask(new_mesh, mesh);
   }
 
   BKE_mesh_nomain_to_mesh(new_mesh, mesh, ob, &CD_MASK_MESH, true);
@@ -428,7 +428,7 @@ static void quadriflow_start_job(void *customdata, short 
*stop, short *do_update
 
   if (qj->preserve_paint_mask) {
     BKE_mesh_runtime_clear_geometry(mesh);
-    BKE_remesh_reproject_paint_mask(new_mesh, mesh);
+    BKE_mesh_remesh_reproject_paint_mask(new_mesh, mesh);
   }
 
   BKE_mesh_nomain_to_mesh(new_mesh, mesh, ob, &CD_MASK_MESH, true);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs