[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45856] trunk/blender: rename Mesh. uv_loop_layers --> uv_layers

Campbell Barton ideasman42 at gmail.com
Mon Apr 23 01:51:51 CEST 2012


Revision: 45856
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45856
Author:   campbellbarton
Date:     2012-04-22 23:51:50 +0000 (Sun, 22 Apr 2012)
Log Message:
-----------
rename Mesh.uv_loop_layers --> uv_layers

add filtering for document generator to support --partial bpy.types.SomeType

Modified Paths:
--------------
    trunk/blender/doc/python_api/rst/include__bmesh.rst
    trunk/blender/doc/python_api/rst/info_gotcha.rst
    trunk/blender/doc/python_api/sphinx_doc_gen.py
    trunk/blender/release/scripts/startup/bl_operators/mesh.py
    trunk/blender/release/scripts/startup/bl_operators/object.py
    trunk/blender/release/scripts/startup/bl_operators/uvcalc_follow_active.py
    trunk/blender/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    trunk/blender/source/blender/makesrna/intern/rna_mesh.c
    trunk/blender/source/tests/bl_mesh_modifiers.py

Modified: trunk/blender/doc/python_api/rst/include__bmesh.rst
===================================================================
--- trunk/blender/doc/python_api/rst/include__bmesh.rst	2012-04-22 22:13:19 UTC (rev 45855)
+++ trunk/blender/doc/python_api/rst/include__bmesh.rst	2012-04-22 23:51:50 UTC (rev 45856)
@@ -32,13 +32,12 @@
 
 .. warning::
 
-   TODO Items Are
+   TODO items are...
 
    * add access to BMesh **walkers**
-   * add a way to re-tessellate an editmode bmesh.
-   * add deform vert custom-data access.
+   * add api for calling BMesh operators (unrelated to bpy.ops)
+   * add custom-data manipulation functions add/remove/rename.
 
-
 Example Script
 --------------
 
@@ -110,8 +109,8 @@
    shape_lay = bm.verts.layers.shape["Key.001"]
 
    for vert in bm.verts:
-		shape = vert[shape_lay]
-        print("Vert Shape: %f, %f, %f" % (shape.x, shape.y, shape.z))
+       shape = vert[shape_lay]
+       print("Vert Shape: %f, %f, %f" % (shape.x, shape.y, shape.z))
 
 
 .. code-block:: python
@@ -125,7 +124,7 @@
 
    for vert in bm.verts:
        dvert = vert[dvert_lay]
-		
+
        if group_index in dvert:
            print("Weight %f" % dvert[group_index])
        else:

Modified: trunk/blender/doc/python_api/rst/info_gotcha.rst
===================================================================
--- trunk/blender/doc/python_api/rst/info_gotcha.rst	2012-04-22 22:13:19 UTC (rev 45855)
+++ trunk/blender/doc/python_api/rst/info_gotcha.rst	2012-04-22 23:51:50 UTC (rev 45856)
@@ -132,6 +132,8 @@
 For the time being this limitation just has to be worked around but we're aware its frustrating needs to be addressed.
 
 
+.. _info_gotcha_mesh_faces:
+
 NGons and Tessellation Faces
 ============================
 

Modified: trunk/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- trunk/blender/doc/python_api/sphinx_doc_gen.py	2012-04-22 22:13:19 UTC (rev 45855)
+++ trunk/blender/doc/python_api/sphinx_doc_gen.py	2012-04-22 23:51:50 UTC (rev 45856)
@@ -230,10 +230,10 @@
 
 else:
     # can manually edit this too:
-    FILTER_BPY_OPS = ("import.scene", )  # allow
-    FILTER_BPY_TYPES = ("bpy_struct", "Operator", "ID")  # allow
+    #FILTER_BPY_OPS = ("import.scene", )  # allow
+    #FILTER_BPY_TYPES = ("bpy_struct", "Operator", "ID")  # allow
     EXCLUDE_INFO_DOCS = True
-    EXCLUDE_MODULES = (
+    EXCLUDE_MODULES = [
         "aud",
         "bge",
         "bge.constraints",
@@ -261,7 +261,7 @@
         "mathutils",
         "mathutils.geometry",
         "mathutils.noise",
-    )
+        ]
 
     # ------
     # Filter
@@ -269,8 +269,19 @@
     # TODO, support bpy.ops and bpy.types filtering
     import fnmatch
     m = None
-    EXCLUDE_MODULES = tuple([m for m in EXCLUDE_MODULES if not fnmatch.fnmatchcase(m, ARGS.partial)])
+    EXCLUDE_MODULES = [m for m in EXCLUDE_MODULES if not fnmatch.fnmatchcase(m, ARGS.partial)]
 
+    # special support for bpy.types.XXX
+    FILTER_BPY_OPS = tuple([m[8:] for m in ARGS.partial.split(":") if m.startswith("bpy.ops.")])
+    if FILTER_BPY_OPS:
+        EXCLUDE_MODULES.remove("bpy.ops")
+
+    FILTER_BPY_TYPES = tuple([m[10:] for m in ARGS.partial.split(":") if m.startswith("bpy.types.")])
+    if FILTER_BPY_TYPES:
+        EXCLUDE_MODULES.remove("bpy.types")
+
+    print(FILTER_BPY_TYPES)
+
     EXCLUDE_INFO_DOCS = (not fnmatch.fnmatchcase("info", ARGS.partial))
 
     del m

Modified: trunk/blender/release/scripts/startup/bl_operators/mesh.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/mesh.py	2012-04-22 22:13:19 UTC (rev 45855)
+++ trunk/blender/release/scripts/startup/bl_operators/mesh.py	2012-04-22 23:51:50 UTC (rev 45856)
@@ -79,7 +79,7 @@
         polys = mesh.polygons
         loops = mesh.loops
         verts = mesh.vertices
-        uv_loops = mesh.uv_loop_layers.active.data
+        uv_loops = mesh.uv_layers.active.data
         nbr_polys = len(polys)
 
         mirror_pm = {}

Modified: trunk/blender/release/scripts/startup/bl_operators/object.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/object.py	2012-04-22 22:13:19 UTC (rev 45855)
+++ trunk/blender/release/scripts/startup/bl_operators/object.py	2012-04-22 23:51:50 UTC (rev 45856)
@@ -489,7 +489,7 @@
 
             # seems to be the fastest way to create an array
             uv_array = array.array('f', [0.0] * 2) * nbr_loops
-            mesh.uv_loop_layers.active.data.foreach_get("uv", uv_array)
+            mesh.uv_layers.active.data.foreach_get("uv", uv_array)
 
             objects = context.selected_editable_objects[:]
 
@@ -516,10 +516,10 @@
                                                ),
                                            )
                             else:
-                                uv_other = mesh_other.uv_loop_layers.active
+                                uv_other = mesh_other.uv_layers.active
                                 if not uv_other:
                                     mesh_other.uv_textures.new()
-                                    uv_other = mesh_other.uv_loop_layers.active
+                                    uv_other = mesh_other.uv_layers.active
                                     if not uv_other:
                                         self.report({'ERROR'}, "Could not add "
                                                     "a new UV map tp object "

Modified: trunk/blender/release/scripts/startup/bl_operators/uvcalc_follow_active.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/uvcalc_follow_active.py	2012-04-22 22:13:19 UTC (rev 45855)
+++ trunk/blender/release/scripts/startup/bl_operators/uvcalc_follow_active.py	2012-04-22 23:51:50 UTC (rev 45856)
@@ -59,7 +59,7 @@
         vidx_source = face_source.vertices
         vidx_target = face_target.vertices
 
-        uv_layer = me.uv_loop_layers.active.data
+        uv_layer = me.uv_layers.active.data
         uvs_source = [uv_layer[i].uv for i in face_source.loop_indices]
         uvs_target = [uv_layer[i].uv for i in face_target.loop_indices]
 

Modified: trunk/blender/release/scripts/startup/bl_operators/uvcalc_lightmap.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/uvcalc_lightmap.py	2012-04-22 22:13:19 UTC (rev 45855)
+++ trunk/blender/release/scripts/startup/bl_operators/uvcalc_lightmap.py	2012-04-22 23:51:50 UTC (rev 45856)
@@ -88,7 +88,7 @@
             self.children = []
 
         else:  # blender face
-            uv_layer = data.id_data.uv_loop_layers.active.data
+            uv_layer = data.id_data.uv_layers.active.data
             self.uv = [uv_layer[i].uv for i in data.loop_indices]
 
             # cos = [v.co for v in data]
@@ -158,7 +158,7 @@
                 I = [i for a, i in angles_co]
 
                 #~ fuv = f.uv
-                uv_layer = f.id_data.uv_loop_layers.active.data
+                uv_layer = f.id_data.uv_layers.active.data
                 fuv = [uv_layer[i].uv for i in f.loops]  # XXX25
 
                 if self.rot:

Modified: trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py	2012-04-22 22:13:19 UTC (rev 45855)
+++ trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py	2012-04-22 23:51:50 UTC (rev 45856)
@@ -889,7 +889,7 @@
         if not me.uv_textures: # Mesh has no UV Coords, don't bother.
             me.uv_textures.new()
 
-        uv_layer = me.uv_loop_layers.active.data
+        uv_layer = me.uv_layers.active.data
         me_verts = list(me.vertices)
 
         if USER_ONLY_SELECTED_FACES:

Modified: trunk/blender/source/blender/makesrna/intern/rna_mesh.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_mesh.c	2012-04-22 22:13:19 UTC (rev 45855)
+++ trunk/blender/source/blender/makesrna/intern/rna_mesh.c	2012-04-22 23:51:50 UTC (rev 45856)
@@ -509,19 +509,19 @@
 	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_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 @@
 	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 @@
 
 	prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_UNSIGNED);
 	RNA_def_property_struct_type(prop, "MeshUVLoopLayer");

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list