[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53722] trunk/blender/source/blender/ blenkernel: remove CustomData_get_active_offset(), use CustomData_get_offset to return the active layer, matching CustomData_get()
Campbell Barton
ideasman42 at gmail.com
Fri Jan 11 02:41:28 CET 2013
Revision: 53722
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53722
Author: campbellbarton
Date: 2013-01-11 01:41:27 +0000 (Fri, 11 Jan 2013)
Log Message:
-----------
remove CustomData_get_active_offset(), use CustomData_get_offset to return the active layer, matching CustomData_get()
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_customdata.h
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
Modified: trunk/blender/source/blender/blenkernel/BKE_customdata.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_customdata.h 2013-01-11 01:30:44 UTC (rev 53721)
+++ trunk/blender/source/blender/blenkernel/BKE_customdata.h 2013-01-11 01:41:27 UTC (rev 53722)
@@ -251,7 +251,6 @@
const char *name);
int CustomData_get_offset(const struct CustomData *data, int type);
int CustomData_get_n_offset(const struct CustomData *data, int type, int n);
-int CustomData_get_active_offset(const struct CustomData *data, int type);
int CustomData_get_layer_index(const struct CustomData *data, int type);
int CustomData_get_layer_index_n(const struct CustomData *data, int type, int n);
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2013-01-11 01:30:44 UTC (rev 53721)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2013-01-11 01:41:27 UTC (rev 53722)
@@ -2098,7 +2098,7 @@
int CustomData_get_offset(const CustomData *data, int type)
{
/* get the layer index of the active layer of type */
- int layer_index = CustomData_get_layer_index(data, type);
+ int layer_index = CustomData_get_active_layer_index(data, type);
if (layer_index < 0) return -1;
return data->layers[layer_index].offset;
@@ -2113,15 +2113,6 @@
return data->layers[layer_index].offset;
}
-int CustomData_get_active_offset(const CustomData *data, int type)
-{
- /* get the layer index of the active layer of type */
- int layer_index = CustomData_get_active_layer_index(data, type);
- if (layer_index < 0) return -1;
-
- return data->layers[layer_index].offset;
-}
-
int CustomData_set_layer_name(const CustomData *data, int type, int n, const char *name)
{
/* get the layer index of the first layer of type */
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2013-01-11 01:30:44 UTC (rev 53721)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2013-01-11 01:41:27 UTC (rev 53722)
@@ -810,9 +810,9 @@
BMFace *efa;
MLoopUV *luv[3], dummyluv = {{0}};
MLoopCol *lcol[3] = {NULL} /* , dummylcol = {0} */;
- const int cd_loop_uv_offset = CustomData_get_active_offset(&bm->ldata, CD_MLOOPUV);
- const int cd_loop_color_offset = CustomData_get_active_offset(&bm->ldata, CD_MLOOPCOL);
- const int cd_poly_tex_offset = CustomData_get_active_offset(&bm->pdata, CD_MTEXPOLY);
+ const int cd_loop_uv_offset = CustomData_get_offset(&bm->ldata, CD_MLOOPUV);
+ const int cd_loop_color_offset = CustomData_get_offset(&bm->ldata, CD_MLOOPCOL);
+ const int cd_poly_tex_offset = CustomData_get_offset(&bm->pdata, CD_MTEXPOLY);
bool has_uv = (cd_loop_uv_offset != -1);
bool has_vcol = (cd_loop_color_offset != -1);
int i;
More information about the Bf-blender-cvs
mailing list