[Bf-blender-cvs] [d5974eb] master: Cleanup for previous own commit (sorry...)
Bastien Montagne
noreply at git.blender.org
Tue Nov 4 10:32:31 CET 2014
Commit: d5974eb0266104344084e72211b4644e97f4af67
Author: Bastien Montagne
Date: Tue Nov 4 10:31:59 2014 +0100
Branches: master
https://developer.blender.org/rBd5974eb0266104344084e72211b4644e97f4af67
Cleanup for previous own commit (sorry...)
===================================================================
M source/blender/blenkernel/intern/customdata.c
===================================================================
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index fb0135b..8f02ccd 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1873,8 +1873,7 @@ int CustomData_number_of_layers_typemask(const CustomData *data, CustomDataMask
return number;
}
-static void *customData_duplicate_referenced_layer_index(CustomData *data, const int type,
- const int layer_index, const int totelem)
+static void *customData_duplicate_referenced_layer_index(CustomData *data, const int layer_index, const int totelem)
{
CustomDataLayer *layer;
@@ -1908,35 +1907,32 @@ static void *customData_duplicate_referenced_layer_index(CustomData *data, const
void *CustomData_duplicate_referenced_layer(CustomData *data, const int type, const int totelem)
{
- CustomDataLayer *layer;
int layer_index;
/* get the layer index of the first layer of type */
layer_index = CustomData_get_active_layer_index(data, type);
- return customData_duplicate_referenced_layer_index(data, type, layer_index, totelem);
+ return customData_duplicate_referenced_layer_index(data, layer_index, totelem);
}
void *CustomData_duplicate_referenced_layer_n(CustomData *data, const int type, const int n, const int totelem)
{
- CustomDataLayer *layer;
int layer_index;
/* get the layer index of the desired layer */
layer_index = CustomData_get_layer_index_n(data, type, n);
- return customData_duplicate_referenced_layer_index(data, type, layer_index, totelem);
+ return customData_duplicate_referenced_layer_index(data, layer_index, totelem);
}
void *CustomData_duplicate_referenced_layer_named(CustomData *data, const int type, const char *name, const int totelem)
{
- CustomDataLayer *layer;
int layer_index;
/* get the layer index of the desired layer */
layer_index = CustomData_get_named_layer_index(data, type, name);
- return customData_duplicate_referenced_layer_index(data, type, layer_index, totelem);
+ return customData_duplicate_referenced_layer_index(data, layer_index, totelem);
}
bool CustomData_is_referenced_layer(struct CustomData *data, int type)
More information about the Bf-blender-cvs
mailing list