[Bf-blender-cvs] [4d49bc5] mesh-transfer-data: grrrr, forgot to ammend previous commit :/
Bastien Montagne
noreply at git.blender.org
Sun Oct 19 17:08:21 CEST 2014
Commit: 4d49bc572f8d80a8d9b475cccf6037277a86f877
Author: Bastien Montagne
Date: Sun Oct 19 17:07:55 2014 +0200
Branches: mesh-transfer-data
https://developer.blender.org/rB4d49bc572f8d80a8d9b475cccf6037277a86f877
grrrr, forgot to ammend previous commit :/
===================================================================
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 0f27a33..78a86f1 100644
--- a/source/blender/editors/object/object_transfer_data.c
+++ b/source/blender/editors/object/object_transfer_data.c
@@ -300,7 +300,7 @@ static void data_transfer_interp_char(const DataTransferLayerMapping *UNUSED(lay
*data_dst = (char)(weight_dst * 255.0f);
}
-static void data_transfer_mesh_mapping_filter(Object *ob_dst, Mesh2MeshMapping *geom_map, const int data_type,
+static void data_transfer_mesh_mapping_filter(Mesh *me_dst, Mesh2MeshMapping *geom_map, const int data_type,
const int replace_mode, const float replace_threshold)
{
/* TODO!
@@ -686,8 +686,7 @@ bool ED_data_transfer(
Scene *scene, Object *ob_src, Object *ob_dst, const int data_type, const bool use_create,
const int map_vert_mode, const int map_edge_mode, const int map_poly_mode, const int map_loop_mode,
SpaceTransform *space_transform, const float max_distance, const float ray_radius,
- const int UNUSED(replace_mode), const float UNUSED(replace_threshold),
- const int fromlayers_select, const int tolayers_select)
+ const int replace_mode, const float replace_threshold, const int fromlayers_select, const int tolayers_select)
{
DerivedMesh *dm_src;
Mesh *me_dst;
More information about the Bf-blender-cvs
mailing list