Commit: b80cce20539f5eccb752c302a133680497be4af4
Author: Bastien Montagne
Date: Thu Jun 21 15:32:01 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb80cce20539f5eccb752c302a133680497be4af4
Cleanup: names: data transfer/mesh remap: dm -> me/mesh.
That area is now officially purged from the Devil.. errr... DerivedMesh!
===================================================================
M source/blender/blenkernel/BKE_data_transfer.h
M source/blender/blenkernel/BKE_mesh_remap.h
M source/blender/blenkernel/intern/data_transfer.c
M source/blender/blenkernel/intern/mesh_remap.c
M source/blender/modifiers/intern/MOD_datatransfer.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_data_transfer.h
b/source/blender/blenkernel/BKE_data_transfer.h
index 4acf1dfa8eb..7d0bb67c54d 100644
--- a/source/blender/blenkernel/BKE_data_transfer.h
+++ b/source/blender/blenkernel/BKE_data_transfer.h
@@ -143,7 +143,7 @@ bool BKE_object_data_transfer_mesh(
const int fromlayers_select[DT_MULTILAYER_INDEX_MAX], const int
tolayers_select[DT_MULTILAYER_INDEX_MAX],
const int mix_mode, const float mix_factor, const char *vgroup_name,
const bool invert_vgroup,
struct ReportList *reports);
-bool BKE_object_data_transfer_dm(
+bool BKE_object_data_transfer_ex(
struct Depsgraph *depsgraph, struct Scene *scene,
struct Object *ob_src, struct Object *ob_dst, struct Mesh *me_dst,
const int data_types, bool use_create,
diff --git a/source/blender/blenkernel/BKE_mesh_remap.h
b/source/blender/blenkernel/BKE_mesh_remap.h
index 3f520223d1b..7aea856ff34 100644
--- a/source/blender/blenkernel/BKE_mesh_remap.h
+++ b/source/blender/blenkernel/BKE_mesh_remap.h
@@ -140,39 +140,37 @@ enum {
MREMAP_MODE_TOPOLOGY = MREMAP_MODE_VERT |
MREMAP_MODE_EDGE | MREMAP_MODE_LOOP | MREMAP_MODE_POLY,
};
-float BKE_mesh_remap_calc_difference_from_dm(
+float BKE_mesh_remap_calc_difference_from_mesh(
const struct SpaceTransform *space_transform,
- const struct MVert *verts_dst, const int numverts_dst, struct Mesh
*dm_src);
+ const struct MVert *verts_dst, const int numverts_dst, struct Mesh
*me_src);
-void BKE_mesh_remap_find_best_match_from_dm(
- const struct MVert *verts_dst, const int numverts_dst, struct Mesh
*dm_src,
+void BKE_mesh_remap_find_best_match_from_mesh(
+ const struct MVert *verts_dst, const int numverts_dst, struct Mesh
*me_src,
struct SpaceTransform *r_space_transform);
-/* TODO add mesh2mesh versions (we'll need mesh versions of bvhtree funcs too,
though!). */
-
-void BKE_mesh_remap_calc_verts_from_dm(
+void BKE_mesh_remap_calc_verts_from_mesh(
const int mode, const struct SpaceTransform *space_transform, const
float max_dist, const float ray_radius,
const struct MVert *verts_dst, const int numverts_dst, const bool
dirty_nors_dst,
- struct Mesh *dm_src, MeshPairRemap *r_map);
+ struct Mesh *me_src, MeshPairRemap *r_map);
-void BKE_mesh_remap_calc_edges_from_dm(
+void BKE_mesh_remap_calc_edges_from_mesh(
const int mode, const struct SpaceTransform *space_transform, const
float max_dist, const float ray_radius,
const struct MVert *verts_dst, const int numverts_dst, const struct
MEdge *edges_dst, const int numedges_dst,
- const bool dirty_nors_dst, struct Mesh *dm_src, MeshPairRemap *r_map);
+ const bool dirty_nors_dst, struct Mesh *me_src, MeshPairRemap *r_map);
-void BKE_mesh_remap_calc_loops_from_dm(
+void BKE_mesh_remap_calc_loops_from_mesh(
const int mode, const struct SpaceTransform *space_transform, const
float max_dist, const float ray_radius,
struct MVert *verts_dst, const int numverts_dst, struct MEdge
*edges_dst, const int numedges_dst,
struct MLoop *loops_dst, const int numloops_dst, struct MPoly
*polys_dst, const int numpolys_dst,
struct CustomData *ldata_dst, struct CustomData *pdata_dst,
const bool use_split_nors_dst, const float split_angle_dst, const bool
dirty_nors_dst,
- struct Mesh *dm_src,
+ struct Mesh *me_src,
MeshRemapIslandsCalc gen_islands_src, const float
islands_precision_src, struct MeshPairRemap *r_map);
-void BKE_mesh_remap_calc_polys_from_dm(
+void BKE_mesh_remap_calc_polys_from_mesh(
const int mode, const struct SpaceTransform *space_transform, const
float max_dist, const float ray_radius,
struct MVert *verts_dst, const int numverts_dst, struct MLoop
*loops_dst, const int numloops_dst,
struct MPoly *polys_dst, const int numpolys_dst, struct CustomData
*pdata_dst, const bool dirty_nors_dst,
- struct Mesh *dm_src, struct MeshPairRemap *r_map);
+ struct Mesh *me_src, struct MeshPairRemap *r_map);
#endif /* __BKE_MESH_REMAP_H__ */
diff --git a/source/blender/blenkernel/intern/data_transfer.c
b/source/blender/blenkernel/intern/data_transfer.c
index 675344025e2..7006e4ddaa6 100644
--- a/source/blender/blenkernel/intern/data_transfer.c
+++ b/source/blender/blenkernel/intern/data_transfer.c
@@ -255,26 +255,26 @@ int BKE_object_data_transfer_dttype_to_srcdst_index(const
int dtdata_type)
/* Generic pre/post processing, only used by custom loop normals currently. */
static void data_transfer_dtdata_type_preprocess(
- Mesh *dm_src, Mesh *dm_dst,
+ Mesh *me_src, Mesh *me_dst,
const int dtdata_type, const bool dirty_nors_dst)
{
if (dtdata_type == DT_TYPE_LNOR) {
/* Compute custom normals into regular loop normals, which will
be used for the transfer. */
- MVert *verts_dst = dm_dst->mvert;
- const int num_verts_dst = dm_dst->totvert;
- MEdge *edges_dst = dm_dst->medge;
- const int num_edges_dst = dm_dst->totedge;
- MPoly *polys_dst = dm_dst->mpoly;
- const int num_polys_dst = dm_dst->totpoly;
- MLoop *loops_dst = dm_dst->mloop;
- const int num_loops_dst = dm_dst->totloop;
- CustomData *pdata_dst = &dm_dst->pdata;
- CustomData *ldata_dst = &dm_dst->ldata;
-
- const bool use_split_nors_dst = (dm_dst->flag & ME_AUTOSMOOTH)
!= 0;
- const float split_angle_dst = dm_dst->smoothresh;
-
- BKE_mesh_calc_normals_split(dm_src);
+ MVert *verts_dst = me_dst->mvert;
+ const int num_verts_dst = me_dst->totvert;
+ MEdge *edges_dst = me_dst->medge;
+ const int num_edges_dst = me_dst->totedge;
+ MPoly *polys_dst = me_dst->mpoly;
+ const int num_polys_dst = me_dst->totpoly;
+ MLoop *loops_dst = me_dst->mloop;
+ const int num_loops_dst = me_dst->totloop;
+ CustomData *pdata_dst = &me_dst->pdata;
+ CustomData *ldata_dst = &me_dst->ldata;
+
+ const bool use_split_nors_dst = (me_dst->flag & ME_AUTOSMOOTH)
!= 0;
+ const float split_angle_dst = me_dst->smoothresh;
+
+ BKE_mesh_calc_normals_split(me_src);
float (*poly_nors_dst)[3];
float (*loop_nors_dst)[3];
@@ -310,7 +310,7 @@ static void data_transfer_dtdata_type_preprocess(
}
static void data_transfer_dtdata_type_postprocess(
- Object *UNUSED(ob_src), Object *UNUSED(ob_dst), Mesh *UNUSED(dm_src),
Mesh *me_dst,
+ Object *UNUSED(ob_src), Object *UNUSED(ob_dst), Mesh *UNUSED(me_src),
Mesh *me_dst,
const int dtdata_type, const bool changed)
{
if (dtdata_type == DT_TYPE_LNOR) {
@@ -528,7 +528,7 @@ static bool
data_transfer_layersmapping_cdlayers_multisrc_to_dst(
continue;
}
data_src =
CustomData_get_layer_n(cd_src, cddata_type, idx_src);
- /* If dest is a derivedmesh, we do not
want to overwrite cdlayers of org mesh! */
+ /* If dest is a evaluated mesh (fro;
;odifier), we do not want to overwrite cdlayers of orig mesh! */
if (use_dupref_dst) {
data_dst =
CustomData_duplicate_referenced_layer_n(cd_dst, cddata_type, idx_src,
num_elem_dst);
}
@@ -572,7 +572,7 @@ static bool
data_transfer_layersmapping_cdlayers_multisrc_to_dst(
data_dst_to_delete[idx_dst] = false;
}
if (r_map) {
- /* If dest is a derivedmesh, we do not
want to overwrite cdlayers of org mesh! */
+ /* If dest is a evaluated mesh (from
modifier), we do not want to overwrite cdlayers of orig mesh! */
if (use_dupref_dst) {
data_dst =
CustomData_duplicate_referenced_layer_n(cd_dst, cddata_type, idx_dst,
num_elem_dst);
}
@@ -630,7 +630,7 @@ static bool data_transfer_layersmapping_cdlayers(
data_dst = CustomData_add_layer(cd_dst, cddata_type,
CD_CALLOC, NULL, num_elem_dst);
}
else if (use_dupref_dst && r_map) {
- /* If dest is a derivedmesh, we do not want to
overwrite cdlayers of org mesh! */
+ /* If dest is a evaluated mesh (from modifier), we do
not want to overwrite cdlayers of orig mesh! */
data_dst =
CustomData_duplicate_referenced_layer(cd_dst, cddata_type, num_elem_dst);
}
@@ -657,7 +657,7 @@ static bool data_transfer_layersmapping_cdlayers(
if (tolayers >= 0) { /* Real-layer index */
idx_dst = tolayers;
- /* If dest is a derivedmesh, we do not want to
overwrite cdlayers of org mesh! */
+ /* If dest is a evaluated mesh (from modifier), we do
not want to overwrite cdlayers of orig mesh! */
if (use_dupref_dst && r_map) {
data_dst =
CustomData_duplicate_referenced_layer_n(cd_dst, cddata_type, idx_dst,
num_elem_dst);
}
@@ -673,7 +673,7 @@ static bool data_transfer_layersmapping_cdlayers(
data_dst = CustomData_add_layer(cd_dst,
cddata_type, CD_CALLOC, NULL, num_elem_dst);
}
else {
- /* If dest is a derivedmesh, we do not want to
overwrite cdlayers of org mesh! */
+ /* If dest is a evaluated mesh (from modifier),
we do not want to overwrite cdlayers of orig mesh! */
if (use_dupref_dst && r_map) {
data_dst =
CustomData_duplicate_referenced_layer_n(cd_dst, cddata_type, idx_dst,
num_elem_dst);
}
@@ -694,7 +694,7 @@ static bool data_transfer_layersmapping_cdlayers(
CustomData_add_layer(cd_dst,
cddata_type, CD_CALLOC, NULL, num_elem_dst);
}
}
- /* If dest is a derivedmesh, we do not want to
overwrite cdlayers of org mesh! */
+ /* If dest is a evaluated mesh (from modifier), we do
not want to overwrite cdlayers of orig mesh! */
if (use_dupref_dst && r_map) {
data_dst =
CustomData_duplicate_referenced_layer_n(cd_dst, cddata_type, idx_dst,
num_elem_dst);
}
@@ -711,7 +711,7 @@ static bool data_transfer_layersmapping_cdlayers(
CustomData_add_layer_named(cd_dst, cddata_type,
CD_CALLOC, NULL, num_elem_dst, name);
idx_dst = CustomData_get_named_layer(cd_dst,
cddata_type, name);
}
- /* If dest is a derivedmesh, we do not want to
overwrite cdlayers of org mesh! */
+ /* If dest is a evaluated mesh (from modifier), we do
not want to overwrite cdlayers of orig mesh! */
if (use_dupref_dst && r_map) {
data_dst =
CustomData_duplicate_referenced_layer_n(cd_dst, cddata_type, idx_dst,
num_elem_dst);
}
@@ -760,7 +760,7 @@ static bool data_transfer_layersmapping_cdlayers(
}
static bool data_transfer_layersmapping_genera
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
