diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-04-23 03:51:50 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-23 03:51:50 +0400 |
commit | 1642e2888c296d71b2facd1a607f24a5992bb164 (patch) | |
tree | 79af894b21bfc5884295782612852b5d874e459d /source | |
parent | a164aa1ab6c23e068bb4c136609fc09a1347f990 (diff) |
rename Mesh.uv_loop_layers --> uv_layers
add filtering for document generator to support --partial bpy.types.SomeType
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesrna/intern/rna_mesh.c | 62 | ||||
-rw-r--r-- | source/tests/bl_mesh_modifiers.py | 2 |
2 files changed, 32 insertions, 32 deletions
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 78f62194735..d5e79ab971c 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -509,19 +509,19 @@ static void rna_CustomDataLayer_clone_set(PointerRNA *ptr, CustomData *data, int CustomData_set_layer_clone_index(data, type, n); } -/* uv_loop_layers */ +/* uv_layers */ -DEFINE_CUSTOMDATA_LAYER_COLLECTION(uv_loop_layer, ldata, CD_MLOOPUV) -DEFINE_CUSTOMDATA_LAYER_COLLECTION_ACTIVEITEM(uv_loop_layer, ldata, CD_MLOOPUV, active, MeshUVLoopLayer) -DEFINE_CUSTOMDATA_LAYER_COLLECTION_ACTIVEITEM(uv_loop_layer, ldata, CD_MLOOPUV, clone, MeshUVLoopLayer) -DEFINE_CUSTOMDATA_LAYER_COLLECTION_ACTIVEITEM(uv_loop_layer, ldata, CD_MLOOPUV, stencil, MeshUVLoopLayer) -DEFINE_CUSTOMDATA_LAYER_COLLECTION_ACTIVEITEM(uv_loop_layer, ldata, CD_MLOOPUV, render, MeshUVLoopLayer) +DEFINE_CUSTOMDATA_LAYER_COLLECTION(uv_layer, ldata, CD_MLOOPUV) +DEFINE_CUSTOMDATA_LAYER_COLLECTION_ACTIVEITEM(uv_layer, ldata, CD_MLOOPUV, active, MeshUVLoopLayer) +DEFINE_CUSTOMDATA_LAYER_COLLECTION_ACTIVEITEM(uv_layer, ldata, CD_MLOOPUV, clone, MeshUVLoopLayer) +DEFINE_CUSTOMDATA_LAYER_COLLECTION_ACTIVEITEM(uv_layer, ldata, CD_MLOOPUV, stencil, MeshUVLoopLayer) +DEFINE_CUSTOMDATA_LAYER_COLLECTION_ACTIVEITEM(uv_layer, ldata, CD_MLOOPUV, render, MeshUVLoopLayer) /* MeshUVLoopLayer */ static char *rna_MeshUVLoopLayer_path(PointerRNA *ptr) { - return BLI_sprintfN("uv_loop_layer[\"%s\"]", ((CustomDataLayer*)ptr->data)->name); + return BLI_sprintfN("uv_layers[\"%s\"]", ((CustomDataLayer*)ptr->data)->name); } static void rna_MeshUVLoopLayer_data_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) @@ -1089,7 +1089,7 @@ static char *rna_FaceCustomData_data_path(PointerRNA *ptr, char *collection, int static char *rna_MeshUVLoop_path(PointerRNA *ptr) { - return rna_LoopCustomData_data_path(ptr, "uv_loop_layers", CD_MLOOPUV); + return rna_LoopCustomData_data_path(ptr, "uv_layers", CD_MLOOPUV); } static char *rna_MeshTextureFace_path(PointerRNA *ptr) @@ -2291,7 +2291,7 @@ static void rna_def_loop_colors(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); } -static void rna_def_uv_loop_layers(BlenderRNA *brna, PropertyRNA *cprop) +static void rna_def_uv_layers(BlenderRNA *brna, PropertyRNA *cprop) { StructRNA *srna; PropertyRNA *prop; @@ -2306,15 +2306,15 @@ static void rna_def_uv_loop_layers(BlenderRNA *brna, PropertyRNA *cprop) prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_UNSIGNED); RNA_def_property_struct_type(prop, "MeshUVLoopLayer"); - RNA_def_property_pointer_funcs(prop, "rna_Mesh_uv_loop_layer_active_get", - "rna_Mesh_uv_loop_layer_active_set", NULL, NULL); + RNA_def_property_pointer_funcs(prop, "rna_Mesh_uv_layer_active_get", + "rna_Mesh_uv_layer_active_set", NULL, NULL); RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Active UV loop layer", "Active UV loop layer"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); prop = RNA_def_property(srna, "active_index", PROP_INT, PROP_UNSIGNED); - RNA_def_property_int_funcs(prop, "rna_Mesh_uv_loop_layer_active_index_get", - "rna_Mesh_uv_loop_layer_active_index_set", "rna_Mesh_uv_loop_layer_index_range"); + RNA_def_property_int_funcs(prop, "rna_Mesh_uv_layer_active_index_get", + "rna_Mesh_uv_layer_active_index_set", "rna_Mesh_uv_layer_index_range"); RNA_def_property_ui_text(prop, "Active UV loop layer Index", "Active UV loop layer index"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); } @@ -2385,7 +2385,7 @@ static void rna_def_polygon_string_layers(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_function_return(func, parm); } -/* mesh.uv_layers */ +/* mesh.tessface_uv_layers */ static void rna_def_tessface_uv_textures(BlenderRNA *brna, PropertyRNA *cprop) { StructRNA *srna; @@ -2446,7 +2446,7 @@ static void rna_def_uv_textures(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_function_return(func, parm); /* - func = RNA_def_function(srna, "remove", "rna_Mesh_uv_layers_remove"); + func = RNA_def_function(srna, "remove", "rna_Mesh_uv_texture_layers_remove"); RNA_def_function_ui_description(func, "Remove a vertex color layer"); RNA_def_function_flag(func, FUNC_USE_REPORTS); parm = RNA_def_pointer(func, "layer", "Layer", "", "The layer to remove"); @@ -2519,36 +2519,36 @@ static void rna_def_mesh(BlenderRNA *brna) "Use another mesh for texture indices (vertex indices must be aligned)"); /* UV loop layers */ - prop = RNA_def_property(srna, "uv_loop_layers", PROP_COLLECTION, PROP_NONE); + prop = RNA_def_property(srna, "uv_layers", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "ldata.layers", "ldata.totlayer"); - RNA_def_property_collection_funcs(prop, "rna_Mesh_uv_loop_layers_begin", NULL, NULL, NULL, - "rna_Mesh_uv_loop_layers_length", NULL, NULL, NULL); + RNA_def_property_collection_funcs(prop, "rna_Mesh_uv_layers_begin", NULL, NULL, NULL, + "rna_Mesh_uv_layers_length", NULL, NULL, NULL); RNA_def_property_struct_type(prop, "MeshUVLoopLayer"); RNA_def_property_ui_text(prop, "UV Loop Layers", "All UV loop layers"); - rna_def_uv_loop_layers(brna, prop); + rna_def_uv_layers(brna, prop); - prop = RNA_def_property(srna, "uv_loop_layer_clone", PROP_POINTER, PROP_UNSIGNED); + prop = RNA_def_property(srna, "uv_layer_clone", PROP_POINTER, PROP_UNSIGNED); RNA_def_property_struct_type(prop, "MeshUVLoopLayer"); - RNA_def_property_pointer_funcs(prop, "rna_Mesh_uv_loop_layer_clone_get", - "rna_Mesh_uv_loop_layer_clone_set", NULL, NULL); + RNA_def_property_pointer_funcs(prop, "rna_Mesh_uv_layer_clone_get", + "rna_Mesh_uv_layer_clone_set", NULL, NULL); RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Clone UV loop layer", "UV loop layer to be used as cloning source"); - prop = RNA_def_property(srna, "uv_loop_layer_clone_index", PROP_INT, PROP_UNSIGNED); - RNA_def_property_int_funcs(prop, "rna_Mesh_uv_loop_layer_clone_index_get", - "rna_Mesh_uv_loop_layer_clone_index_set", "rna_Mesh_uv_loop_layer_index_range"); + prop = RNA_def_property(srna, "uv_layer_clone_index", PROP_INT, PROP_UNSIGNED); + RNA_def_property_int_funcs(prop, "rna_Mesh_uv_layer_clone_index_get", + "rna_Mesh_uv_layer_clone_index_set", "rna_Mesh_uv_layer_index_range"); RNA_def_property_ui_text(prop, "Clone UV loop layer Index", "Clone UV loop layer index"); - prop = RNA_def_property(srna, "uv_loop_layer_stencil", PROP_POINTER, PROP_UNSIGNED); + prop = RNA_def_property(srna, "uv_layer_stencil", PROP_POINTER, PROP_UNSIGNED); RNA_def_property_struct_type(prop, "MeshUVLoopLayer"); - RNA_def_property_pointer_funcs(prop, "rna_Mesh_uv_loop_layer_stencil_get", - "rna_Mesh_uv_loop_layer_stencil_set", NULL, NULL); + RNA_def_property_pointer_funcs(prop, "rna_Mesh_uv_layer_stencil_get", + "rna_Mesh_uv_layer_stencil_set", NULL, NULL); RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Mask UV loop layer", "UV loop layer to mask the painted area"); - prop = RNA_def_property(srna, "uv_loop_layer_stencil_index", PROP_INT, PROP_UNSIGNED); - RNA_def_property_int_funcs(prop, "rna_Mesh_uv_loop_layer_stencil_index_get", - "rna_Mesh_uv_loop_layer_stencil_index_set", "rna_Mesh_uv_loop_layer_index_range"); + prop = RNA_def_property(srna, "uv_layer_stencil_index", PROP_INT, PROP_UNSIGNED); + RNA_def_property_int_funcs(prop, "rna_Mesh_uv_layer_stencil_index_get", + "rna_Mesh_uv_layer_stencil_index_set", "rna_Mesh_uv_layer_index_range"); RNA_def_property_ui_text(prop, "Mask UV loop layer Index", "Mask UV loop layer index"); /* Tessellated face UV maps - used by renderers */ diff --git a/source/tests/bl_mesh_modifiers.py b/source/tests/bl_mesh_modifiers.py index 0ab2213c0e1..390679800f6 100644 --- a/source/tests/bl_mesh_modifiers.py +++ b/source/tests/bl_mesh_modifiers.py @@ -260,7 +260,7 @@ def mesh_uv_add(obj): if IS_BMESH: # XXX, odd that we need to do this. until uvs and texface # are separated we will need to keep it - uv_loops = obj.data.uv_loop_layers[-1] + uv_loops = obj.data.uv_layers[-1] uv_list = uv_loops.data[:] for poly in obj.data.polygons: poly_uvs = mesh_bmesh_poly_elems(poly, uv_list) |