Revision: 45365 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45365 Author: campbellbarton Date: 2012-04-03 11:10:26 +0000 (Tue, 03 Apr 2012) Log Message: ----------- rna/py api - rename layers with polygon prefix, since there are edge and vertex layers too.
Modified Paths: -------------- trunk/blender/source/blender/makesrna/intern/rna_mesh.c Modified: trunk/blender/source/blender/makesrna/intern/rna_mesh.c =================================================================== --- trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2012-04-03 09:11:26 UTC (rev 45364) +++ trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2012-04-03 11:10:26 UTC (rev 45365) @@ -759,14 +759,14 @@ return (layer->type != CD_PROP_FLT); } -static void rna_Mesh_float_layers_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Mesh_polygon_float_layers_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { CustomData *pdata = rna_mesh_pdata(ptr); rna_iterator_array_begin(iter, (void*)pdata->layers, sizeof(CustomDataLayer), pdata->totlayer, 0, rna_float_layer_check); } -static int rna_Mesh_float_layers_length(PointerRNA *ptr) +static int rna_Mesh_polygon_float_layers_length(PointerRNA *ptr) { return CustomData_number_of_layers(rna_mesh_pdata(ptr), CD_PROP_FLT); } @@ -790,14 +790,14 @@ return me->totface; } -static void rna_Mesh_int_layers_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Mesh_polygon_int_layers_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { CustomData *pdata = rna_mesh_pdata(ptr); rna_iterator_array_begin(iter, (void*)pdata->layers, sizeof(CustomDataLayer), pdata->totlayer, 0, rna_int_layer_check); } -static int rna_Mesh_int_layers_length(PointerRNA *ptr) +static int rna_Mesh_polygon_int_layers_length(PointerRNA *ptr) { return CustomData_number_of_layers(rna_mesh_pdata(ptr), CD_PROP_INT); } @@ -821,14 +821,14 @@ return me->totface; } -static void rna_Mesh_string_layers_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Mesh_polygon_string_layers_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { CustomData *pdata = rna_mesh_pdata(ptr); rna_iterator_array_begin(iter, (void*)pdata->layers, sizeof(CustomDataLayer), pdata->totlayer, 0, rna_string_layer_check); } -static int rna_Mesh_string_layers_length(PointerRNA *ptr) +static int rna_Mesh_polygon_string_layers_length(PointerRNA *ptr) { return CustomData_number_of_layers(rna_mesh_pdata(ptr), CD_PROP_STR); } @@ -2619,26 +2619,26 @@ RNA_def_property_ui_text(prop, "Vertex Colors", "All vertex colors"); rna_def_loop_colors(brna, prop); - prop = RNA_def_property(srna, "layers_float", PROP_COLLECTION, PROP_NONE); + prop = RNA_def_property(srna, "polygon_layers_float", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "pdata.layers", "pdata.totlayer"); - RNA_def_property_collection_funcs(prop, "rna_Mesh_float_layers_begin", NULL, NULL, NULL, - "rna_Mesh_float_layers_length", NULL, NULL, NULL); + RNA_def_property_collection_funcs(prop, "rna_Mesh_polygon_float_layers_begin", NULL, NULL, NULL, + "rna_Mesh_polygon_float_layers_length", NULL, NULL, NULL); RNA_def_property_struct_type(prop, "MeshFloatPropertyLayer"); RNA_def_property_ui_text(prop, "Float Property Layers", ""); rna_def_float_layers(brna, prop); - prop = RNA_def_property(srna, "layers_int", PROP_COLLECTION, PROP_NONE); + prop = RNA_def_property(srna, "polygon_layers_int", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "pdata.layers", "pdata.totlayer"); - RNA_def_property_collection_funcs(prop, "rna_Mesh_int_layers_begin", NULL, NULL, NULL, - "rna_Mesh_int_layers_length", NULL, NULL, NULL); + RNA_def_property_collection_funcs(prop, "rna_Mesh_polygon_int_layers_begin", NULL, NULL, NULL, + "rna_Mesh_polygon_int_layers_length", NULL, NULL, NULL); RNA_def_property_struct_type(prop, "MeshIntPropertyLayer"); RNA_def_property_ui_text(prop, "Int Property Layers", ""); rna_def_int_layers(brna, prop); - prop = RNA_def_property(srna, "layers_string", PROP_COLLECTION, PROP_NONE); + prop = RNA_def_property(srna, "polygon_layers_string", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "pdata.layers", "pdata.totlayer"); - RNA_def_property_collection_funcs(prop, "rna_Mesh_string_layers_begin", NULL, NULL, NULL, - "rna_Mesh_string_layers_length", NULL, NULL, NULL); + RNA_def_property_collection_funcs(prop, "rna_Mesh_polygon_string_layers_begin", NULL, NULL, NULL, + "rna_Mesh_polygon_string_layers_length", NULL, NULL, NULL); RNA_def_property_struct_type(prop, "MeshStringPropertyLayer"); RNA_def_property_ui_text(prop, "String Property Layers", ""); rna_def_string_layers(brna, prop); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs