[Bf-blender-cvs] [ac9a7b3] mesh-transfer-data: Cleanup: Remove 'mapping postprocess'.
Bastien Montagne
noreply at git.blender.org
Mon Nov 3 20:57:54 CET 2014
Commit: ac9a7b348cb7b797c891053a94f5a88bb126c9b8
Author: Bastien Montagne
Date: Mon Nov 3 20:51:13 2014 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rBac9a7b348cb7b797c891053a94f5a88bb126c9b8
Cleanup: Remove 'mapping postprocess'.
Was not used, and think we do not need it, at least for time being.
===================================================================
M source/blender/editors/object/object_transfer_data.c
===================================================================
diff --git a/source/blender/editors/object/object_transfer_data.c b/source/blender/editors/object/object_transfer_data.c
index 4832491..b1b89d4 100644
--- a/source/blender/editors/object/object_transfer_data.c
+++ b/source/blender/editors/object/object_transfer_data.c
@@ -374,16 +374,6 @@ static void data_transfer_interp_char(const DataTransferLayerMapping *UNUSED(lay
*data_dst = (char)(weight_dst * 255.0f);
}
-static void data_transfer_mesh_mapping_postprocess(Mesh *UNUSED(me_dst), Mesh2MeshMapping *UNUSED(geom_map),
- const int UNUSED(data_type))
-{
- /* TODO!
- * geometry mapping filtering/post-process in some cases (thinking about loop UVs here, especially in case of normal
- * mapping and with islands, many dest loops may end with no source, while others of the same poly have some.
- * this might be better tackled in mapping computation itself, though).
- */
-}
-
/* Helpers to match sources and destinations data layers (also handles 'conversions' in CD_FAKE cases). */
void data_transfer_layersmapping_add_item(
@@ -806,8 +796,6 @@ bool ED_data_transfer(
BKE_dm2mesh_mapping_verts_compute(map_vert_mode, space_transform, max_distance, ray_radius,
me_dst->mvert, me_dst->totvert, dm_src, &geom_map);
- data_transfer_mesh_mapping_postprocess(me_dst, &geom_map, data_type);
-
if (data_transfer_layersmapping_generate(&lay_map, ob_src, ob_dst, dm_src, me_dst, ME_VERT,
data_type, mix_mode, mix_factor,
num_create, fromlayers_select, tolayers_select))
@@ -830,8 +818,6 @@ bool ED_data_transfer(
me_dst->mvert, me_dst->totvert, me_dst->medge, me_dst->totedge,
dm_src, &geom_map);
- data_transfer_mesh_mapping_postprocess(me_dst, &geom_map, data_type);
-
if (data_transfer_layersmapping_generate(&lay_map, ob_src, ob_dst, dm_src, me_dst, ME_EDGE,
data_type, mix_mode, mix_factor,
num_create, fromlayers_select, tolayers_select))
@@ -854,8 +840,6 @@ bool ED_data_transfer(
me_dst->mvert, me_dst->totvert, me_dst->mpoly, me_dst->totpoly,
me_dst->mloop, me_dst->totloop, &me_dst->pdata, dm_src, &geom_map);
- data_transfer_mesh_mapping_postprocess(me_dst, &geom_map, data_type);
-
if (data_transfer_layersmapping_generate(&lay_map, ob_src, ob_dst, dm_src, me_dst, ME_POLY,
data_type, mix_mode, mix_factor,
num_create, fromlayers_select, tolayers_select))
@@ -882,8 +866,6 @@ bool ED_data_transfer(
&me_dst->pdata, &me_dst->ldata, me_dst->smoothresh, dm_src,
island_callback, &geom_map);
- data_transfer_mesh_mapping_postprocess(me_dst, &geom_map, data_type);
-
if (data_transfer_layersmapping_generate(&lay_map, ob_src, ob_dst, dm_src, me_dst, ME_LOOP,
data_type, mix_mode, mix_factor,
num_create, fromlayers_select, tolayers_select))
More information about the Bf-blender-cvs
mailing list