Commit: 096671fb32c6b0e94b14d3c04a186dacb75f6942
Author: Campbell Barton
Date: Fri Nov 21 22:32:34 2014 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rB096671fb32c6b0e94b14d3c04a186dacb75f6942
picky: rename
===================================================================
M source/blender/blenkernel/BKE_customdata.h
M source/blender/blenkernel/intern/data_transfer_intern.h
M source/blender/blenkernel/intern/deform.c
M source/blender/blenkernel/intern/object_data_transfer.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_customdata.h
b/source/blender/blenkernel/BKE_customdata.h
index 52bf72d..08edde1 100644
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@ -432,8 +432,8 @@ typedef struct CustomDataTransferLayerMap {
void *data_src; /* Data source array (can be regular CD data,
vertices/edges/etc., keyblocks...). */
void *data_dst; /* Data dest array (same type as dat_src). */
- int data_n_src; /* Index to affect in data_src (used e.g. for
vgroups). */
- int data_n_dst; /* Index to affect in data_dst (used e.g. for
vgroups). */
+ int data_src_n; /* Index to affect in data_src (used e.g. for
vgroups). */
+ int data_dst_n; /* Index to affect in data_dst (used e.g. for
vgroups). */
size_t elem_size; /* Size of one element of data_src/data_dst. */
size_t data_size; /* Size of actual data we transfer. */
diff --git a/source/blender/blenkernel/intern/data_transfer_intern.h
b/source/blender/blenkernel/intern/data_transfer_intern.h
index 1858641..913325a 100644
--- a/source/blender/blenkernel/intern/data_transfer_intern.h
+++ b/source/blender/blenkernel/intern/data_transfer_intern.h
@@ -45,7 +45,7 @@ typedef void (*cd_datatransfer_interp)(const struct
CustomDataTransferLayerMap *
void data_transfer_layersmapping_add_item(
struct ListBase *r_map, const int data_type, const int mix_mode,
const float mix_factor, const float *mix_weights,
- void *data_src, void *data_dst, const int data_n_src, const int
data_n_dst,
+ void *data_src, void *data_dst, const int data_src_n, const int
data_dst_n,
const size_t elem_size, const size_t data_size, const size_t
data_offset, const uint64_t data_flag,
cd_datatransfer_interp interp);
diff --git a/source/blender/blenkernel/intern/deform.c
b/source/blender/blenkernel/intern/deform.c
index 26c56fd..4ed9278 100644
--- a/source/blender/blenkernel/intern/deform.c
+++ b/source/blender/blenkernel/intern/deform.c
@@ -1071,8 +1071,8 @@ static void vgroups_datatransfer_interp(const
CustomDataTransferLayerMap *laymap
{
MDeformVert **data_src = (MDeformVert **)sources;
MDeformVert *data_dst = (MDeformVert *)dest;
- const int idx_src = laymap->data_n_src;
- const int idx_dst = laymap->data_n_dst;
+ const int idx_src = laymap->data_src_n;
+ const int idx_dst = laymap->data_dst_n;
const int mix_mode = laymap->mix_mode;
diff --git a/source/blender/blenkernel/intern/object_data_transfer.c
b/source/blender/blenkernel/intern/object_data_transfer.c
index 22a90bf..217c036 100644
--- a/source/blender/blenkernel/intern/object_data_transfer.c
+++ b/source/blender/blenkernel/intern/object_data_transfer.c
@@ -313,7 +313,7 @@ static void data_transfer_interp_char(const
CustomDataTransferLayerMap *laymap,
void data_transfer_layersmapping_add_item(
ListBase *r_map, const int cddata_type, const int mix_mode, const
float mix_factor, const float *mix_weights,
- void *data_src, void *data_dst, const int data_n_src, const int
data_n_dst,
+ void *data_src, void *data_dst, const int data_src_n, const int
data_dst_n,
const size_t elem_size, const size_t data_size, const size_t
data_offset, const uint64_t data_flag,
cd_datatransfer_interp interp)
{
@@ -328,8 +328,8 @@ void data_transfer_layersmapping_add_item(
item->data_src = data_src;
item->data_dst = data_dst;
- item->data_n_src = data_n_src;
- item->data_n_dst = data_n_dst;
+ item->data_src_n = data_src_n;
+ item->data_dst_n = data_dst_n;
item->elem_size = elem_size;
item->data_size = data_size;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
