Commit: d5cb734a437cf5d4e687974e263e6d1a4bb2f7fe
Author: Campbell Barton
Date: Mon Nov 17 17:20:39 2014 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rBd5cb734a437cf5d4e687974e263e6d1a4bb2f7fe
cleanup: minor rename
===================================================================
M source/blender/blenkernel/BKE_customdata.h
M source/blender/blenkernel/intern/customdata.c
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 683709b..52bf72d 100644
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@ -373,12 +373,14 @@ void CustomData_external_reload(struct CustomData *data,
/* Mesh-to-mesh transfer data. */
struct MeshPairRemap;
-typedef struct DataTransferLayerMapping DataTransferLayerMapping;
+typedef struct CustomDataTransferLayerMap CustomDataTransferLayerMap;
-typedef void (*cd_datatransfer_interp)(const DataTransferLayerMapping *laymap,
void *dest,
- void **sources, const float *weights,
const int count, const float mix_factor);
+typedef void (*cd_datatransfer_interp)(
+ const CustomDataTransferLayerMap *laymap, void *dest,
+ void **sources, const float *weights, const int count, const float
mix_factor);
-/* Fake CD_LAYERS (those are actually 'real' data stored directly into
elements' structs, or otherwise not (directly)
+/**
+ * Fake CD_LAYERS (those are actually 'real' data stored directly into
elements' structs, or otherwise not (directly)
* accessible to usual CDLayer system). */
enum {
CD_FAKE = 1 << 8,
@@ -420,8 +422,8 @@ enum {
/* etc. etc. */
};
-typedef struct DataTransferLayerMapping {
- DataTransferLayerMapping *next, *prev;
+typedef struct CustomDataTransferLayerMap {
+ CustomDataTransferLayerMap *next, *prev;
int data_type;
int mix_mode;
@@ -439,10 +441,10 @@ typedef struct DataTransferLayerMapping {
uint64_t data_flag; /* For bitflag transfer, flag(s) to affect in
transfered data. */
cd_datatransfer_interp interp;
-} DataTransferLayerMapping;
+} CustomDataTransferLayerMap;
/* Those functions assume src_n and dst_n layers of given type exist in resp.
src and dst. */
-void CustomData_data_transfer(const struct MeshPairRemap *m2mmap, const
DataTransferLayerMapping *laymap);
+void CustomData_data_transfer(const struct MeshPairRemap *me_remap, const
CustomDataTransferLayerMap *laymap);
#ifdef __cplusplus
}
diff --git a/source/blender/blenkernel/intern/customdata.c
b/source/blender/blenkernel/intern/customdata.c
index f0e7e67..6260696 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -3583,7 +3583,7 @@ static bool check_bit_flag(void *data, const size_t
data_size, const uint64_t fl
}
static void customdata_data_transfer_interp_generic(
- const DataTransferLayerMapping *laymap, void *data_dst, void
**sources, const float *weights, const int count,
+ const CustomDataTransferLayerMap *laymap, void *data_dst, void
**sources, const float *weights, const int count,
const float mix_factor)
{
/* Fake interpolation, we actually copy highest weighted source to dest.
@@ -3688,10 +3688,10 @@ static void customdata_data_transfer_interp_generic(
MEM_freeN(tmp_dst);
}
-void CustomData_data_transfer(const MeshPairRemap *m2mmap, const
DataTransferLayerMapping *laymap)
+void CustomData_data_transfer(const MeshPairRemap *me_remap, const
CustomDataTransferLayerMap *laymap)
{
- MeshPairRemapItem *mapit = m2mmap->items;
- const int totelem = m2mmap->items_num;
+ MeshPairRemapItem *mapit = me_remap->items;
+ const int totelem = me_remap->items_num;
int i;
const int data_type = laymap->data_type;
diff --git a/source/blender/blenkernel/intern/data_transfer_intern.h
b/source/blender/blenkernel/intern/data_transfer_intern.h
index 3d3c5e7..20cda32 100644
--- a/source/blender/blenkernel/intern/data_transfer_intern.h
+++ b/source/blender/blenkernel/intern/data_transfer_intern.h
@@ -31,7 +31,7 @@
#ifndef __DATA_TRANSFER_INTERN_H__
#define __DATA_TRANSFER_INTERN_H__
-struct DataTransferLayerMapping;
+struct CustomDataTransferLayerMap;
struct CustomData;
struct ListBase;
@@ -39,7 +39,7 @@ float data_transfer_interp_float_do(
const int mix_mode, const float val_dst, const float val_src, const
float mix_factor);
/* Copied from BKE_customdata.h :( */
-typedef void (*cd_datatransfer_interp)(const struct DataTransferLayerMapping
*laymap, void *dest,
+typedef void (*cd_datatransfer_interp)(const struct CustomDataTransferLayerMap
*laymap, void *dest,
void **sources, const float *weights,
const int count, const float mix_factor);
void data_transfer_layersmapping_add_item(
diff --git a/source/blender/blenkernel/intern/deform.c
b/source/blender/blenkernel/intern/deform.c
index 41220d5..42b287e 100644
--- a/source/blender/blenkernel/intern/deform.c
+++ b/source/blender/blenkernel/intern/deform.c
@@ -1066,7 +1066,7 @@ void BKE_defvert_extract_vgroup_to_polyweights(
/*********** Data Transfer **********/
-static void vgroups_datatransfer_interp(const DataTransferLayerMapping
*laymap, void *dest,
+static void vgroups_datatransfer_interp(const CustomDataTransferLayerMap
*laymap, void *dest,
void **sources, const float *weights,
const int count, const float mix_factor)
{
MDeformVert **data_src = (MDeformVert **)sources;
diff --git a/source/blender/blenkernel/intern/object_data_transfer.c
b/source/blender/blenkernel/intern/object_data_transfer.c
index 3728d7b..e0d3028 100644
--- a/source/blender/blenkernel/intern/object_data_transfer.c
+++ b/source/blender/blenkernel/intern/object_data_transfer.c
@@ -286,7 +286,7 @@ float data_transfer_interp_float_do(
return interpf(val_ret, val_dst, mix_factor);
}
-static void data_transfer_interp_char(const DataTransferLayerMapping *laymap,
void *dest,
+static void data_transfer_interp_char(const CustomDataTransferLayerMap
*laymap, void *dest,
void **sources, const float *weights,
const int count, const float mix_factor)
{
char **data_src = (char **)sources;
@@ -317,7 +317,7 @@ void data_transfer_layersmapping_add_item(
const size_t elem_size, const size_t data_size, const size_t
data_offset, const uint64_t data_flag,
cd_datatransfer_interp interp)
{
- DataTransferLayerMapping *item = MEM_mallocN(sizeof(*item), __func__);
+ CustomDataTransferLayerMap *item = MEM_mallocN(sizeof(*item), __func__);
BLI_assert(data_dst != NULL);
@@ -881,7 +881,7 @@ bool BKE_object_data_transfer_dm(
cddata_type, mix_mode, mix_factor,
weights[VDATA],
num_create, fromlayers, tolayers))
{
- DataTransferLayerMapping *lay_mapit;
+ CustomDataTransferLayerMap *lay_mapit;
changed = (lay_map.first != NULL);
@@ -925,7 +925,7 @@ bool BKE_object_data_transfer_dm(
cddata_type, mix_mode, mix_factor,
weights[EDATA],
num_create, fromlayers, tolayers))
{
- DataTransferLayerMapping *lay_mapit;
+ CustomDataTransferLayerMap *lay_mapit;
changed = (lay_map.first != NULL);
@@ -979,7 +979,7 @@ bool BKE_object_data_transfer_dm(
cddata_type, mix_mode, mix_factor,
weights[LDATA],
num_create, fromlayers, tolayers))
{
- DataTransferLayerMapping *lay_mapit;
+ CustomDataTransferLayerMap *lay_mapit;
changed = (lay_map.first != NULL);
@@ -1027,7 +1027,7 @@ bool BKE_object_data_transfer_dm(
cddata_type, mix_mode, mix_factor,
weights[PDATA],
num_create, fromlayers, tolayers))
{
- DataTransferLayerMapping *lay_mapit;
+ CustomDataTransferLayerMap *lay_mapit;
changed = (lay_map.first != NULL);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
