diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-11-22 05:03:56 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-11-22 05:15:04 +0300 |
commit | 2ecb6645209fe74e58da3bf6f2b5a9af330b8609 (patch) | |
tree | 88851f7d3f39e60b765e17c9b21b8e56eb778d26 /source/blender/blenkernel | |
parent | e3204db7478343aa82d859e544ab0264376e9282 (diff) |
Cleanup: rename mirror -> mesh_mirror
The term mirror on it's own is too ambiguous, use BKE_mesh prefix.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_mesh_mirror.h (renamed from source/blender/blenkernel/BKE_mirror.h) | 20 | ||||
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_mirror.c (renamed from source/blender/blenkernel/intern/mirror.c) | 24 |
3 files changed, 26 insertions, 26 deletions
diff --git a/source/blender/blenkernel/BKE_mirror.h b/source/blender/blenkernel/BKE_mesh_mirror.h index 20eb8a920fc..306bb84bde1 100644 --- a/source/blender/blenkernel/BKE_mirror.h +++ b/source/blender/blenkernel/BKE_mesh_mirror.h @@ -30,16 +30,16 @@ struct MirrorModifierData; struct ModifierEvalContext; struct Object; -struct Mesh *BKE_mirror_bisect_on_mirror_plane(struct MirrorModifierData *mmd, - const struct Mesh *mesh, - int axis, - const float plane_co[3], - float plane_no[3]); +struct Mesh *BKE_mesh_mirror_bisect_on_mirror_plane(struct MirrorModifierData *mmd, + const struct Mesh *mesh, + int axis, + const float plane_co[3], + float plane_no[3]); -struct Mesh *BKE_mirror_apply_mirror_on_axis(struct MirrorModifierData *mmd, - const struct ModifierEvalContext *UNUSED(ctx), - struct Object *ob, - const struct Mesh *mesh, - int axis); +struct Mesh *BKE_mesh_mirror_apply_mirror_on_axis(struct MirrorModifierData *mmd, + const struct ModifierEvalContext *UNUSED(ctx), + struct Object *ob, + const struct Mesh *mesh, + int axis); #endif /* __BKE_MIRROR_H__ */ diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 49cead5c003..fd8a3db1b63 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -99,6 +99,7 @@ set(SRC intern/crazyspace.c intern/curve.c intern/curve_decimate.c + intern/curveprofile.c intern/customdata.c intern/customdata_file.c intern/data_transfer.c @@ -154,12 +155,12 @@ set(SRC intern/mesh_iterators.c intern/mesh_mapping.c intern/mesh_merge.c + intern/mesh_mirror.c intern/mesh_remap.c intern/mesh_remesh_voxel.c intern/mesh_runtime.c intern/mesh_tangent.c intern/mesh_validate.c - intern/mirror.c intern/modifier.c intern/movieclip.c intern/multires.c @@ -185,7 +186,6 @@ set(SRC intern/pbvh_bmesh.c intern/pbvh_parallel.cc intern/pointcache.c - intern/curveprofile.c intern/report.c intern/rigidbody.c intern/scene.c @@ -266,6 +266,7 @@ set(SRC BKE_context.h BKE_crazyspace.h BKE_curve.h + BKE_curveprofile.h BKE_customdata.h BKE_customdata_file.h BKE_data_transfer.h @@ -311,11 +312,11 @@ set(SRC BKE_mesh.h BKE_mesh_iterators.h BKE_mesh_mapping.h + BKE_mesh_mirror.h BKE_mesh_remap.h BKE_mesh_remesh_voxel.h BKE_mesh_runtime.h BKE_mesh_tangent.h - BKE_mirror.h BKE_modifier.h BKE_movieclip.h BKE_multires.h @@ -331,7 +332,6 @@ set(SRC BKE_particle.h BKE_pbvh.h BKE_pointcache.h - BKE_curveprofile.h BKE_report.h BKE_rigidbody.h BKE_scene.h diff --git a/source/blender/blenkernel/intern/mirror.c b/source/blender/blenkernel/intern/mesh_mirror.c index 02e0a2bb3b9..271591d98f0 100644 --- a/source/blender/blenkernel/intern/mirror.c +++ b/source/blender/blenkernel/intern/mesh_mirror.c @@ -30,7 +30,7 @@ #include "BKE_library.h" #include "BKE_library_query.h" #include "BKE_mesh.h" -#include "BKE_mirror.h" +#include "BKE_mesh_mirror.h" #include "BKE_modifier.h" #include "BKE_deform.h" @@ -41,11 +41,11 @@ #include "MOD_modifiertypes.h" -Mesh *BKE_mirror_bisect_on_mirror_plane(MirrorModifierData *mmd, - const Mesh *mesh, - int axis, - const float plane_co[3], - float plane_no[3]) +Mesh *BKE_mesh_mirror_bisect_on_mirror_plane(MirrorModifierData *mmd, + const Mesh *mesh, + int axis, + const float plane_co[3], + float plane_no[3]) { bool do_bisect_flip_axis = ((axis == 0 && mmd->flag & MOD_MIR_BISECT_FLIP_AXIS_X) || (axis == 1 && mmd->flag & MOD_MIR_BISECT_FLIP_AXIS_Y) || @@ -97,11 +97,11 @@ Mesh *BKE_mirror_bisect_on_mirror_plane(MirrorModifierData *mmd, return result; } -Mesh *BKE_mirror_apply_mirror_on_axis(MirrorModifierData *mmd, - const ModifierEvalContext *UNUSED(ctx), - Object *ob, - const Mesh *mesh, - int axis) +Mesh *BKE_mesh_mirror_apply_mirror_on_axis(MirrorModifierData *mmd, + const ModifierEvalContext *UNUSED(ctx), + Object *ob, + const Mesh *mesh, + int axis) { const float tolerance_sq = mmd->tolerance * mmd->tolerance; const bool do_vtargetmap = (mmd->flag & MOD_MIR_NO_MERGE) == 0; @@ -157,7 +157,7 @@ Mesh *BKE_mirror_apply_mirror_on_axis(MirrorModifierData *mmd, Mesh *mesh_bisect = NULL; if (do_bisect) { - mesh_bisect = BKE_mirror_bisect_on_mirror_plane(mmd, mesh, axis, plane_co, plane_no); + mesh_bisect = BKE_mesh_mirror_bisect_on_mirror_plane(mmd, mesh, axis, plane_co, plane_no); mesh = mesh_bisect; } |