[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28035] trunk/blender: - new docstrings for bpy.type.Struct methods & some corrections.

Campbell Barton ideasman42 at gmail.com
Tue Apr 6 09:49:10 CEST 2010


Revision: 28035
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28035
Author:   campbellbarton
Date:     2010-04-06 09:49:10 +0200 (Tue, 06 Apr 2010)

Log Message:
-----------
- new docstrings for bpy.type.Struct methods & some corrections.
- struct.path_to_id() --> path_from_id().

Modified Paths:
--------------
    trunk/blender/release/scripts/keyingsets/keyingsets_utils.py
    trunk/blender/release/scripts/modules/rigify/arm_biped.py
    trunk/blender/release/scripts/modules/rigify/eye_balls.py
    trunk/blender/release/scripts/modules/rigify/eye_lid.py
    trunk/blender/release/scripts/modules/rigify/finger_curl.py
    trunk/blender/release/scripts/modules/rigify/leg_biped.py
    trunk/blender/release/scripts/modules/rigify/leg_quadruped.py
    trunk/blender/release/scripts/modules/rigify/mouth.py
    trunk/blender/release/scripts/modules/rigify/neck_flex.py
    trunk/blender/release/scripts/modules/rigify/palm_curl.py
    trunk/blender/release/scripts/modules/rigify/spine_pivot_flex.py
    trunk/blender/release/scripts/modules/rigify/tail_control.py
    trunk/blender/release/scripts/modules/rigify_utils.py
    trunk/blender/source/blender/python/doc/sphinx_doc_gen.py
    trunk/blender/source/blender/python/intern/bpy_rna.c

Modified: trunk/blender/release/scripts/keyingsets/keyingsets_utils.py
===================================================================
--- trunk/blender/release/scripts/keyingsets/keyingsets_utils.py	2010-04-06 07:02:16 UTC (rev 28034)
+++ trunk/blender/release/scripts/keyingsets/keyingsets_utils.py	2010-04-06 07:49:10 UTC (rev 28035)
@@ -84,7 +84,7 @@
         grouping = None
     else:
         # get the path to the ID-block
-        path = data.path_to_id()
+        path = data.path_from_id()
 
         # try to use the name of the data element to group the F-Curve
         # else fallback on the KeyingSet name

Modified: trunk/blender/release/scripts/modules/rigify/arm_biped.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/arm_biped.py	2010-04-06 07:02:16 UTC (rev 28034)
+++ trunk/blender/release/scripts/modules/rigify/arm_biped.py	2010-04-06 07:49:10 UTC (rev 28035)
@@ -244,7 +244,7 @@
         driver = driver_fcurve.driver
 
 
-        controller_path = fk_chain.arm_p.path_to_id()
+        controller_path = fk_chain.arm_p.path_from_id()
         # add custom prop
         fk_chain.arm_p["hinge"] = 0.0
         prop = rna_idprop_ui_prop_get(fk_chain.arm_p, "hinge", create=True)

Modified: trunk/blender/release/scripts/modules/rigify/eye_balls.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/eye_balls.py	2010-04-06 07:02:16 UTC (rev 28034)
+++ trunk/blender/release/scripts/modules/rigify/eye_balls.py	2010-04-06 07:49:10 UTC (rev 28035)
@@ -197,7 +197,7 @@
     prop["min"] = 0.0
     prop["max"] = 1.0
 
-    free_driver_path = pb[target_ctrl].path_to_id() + '["free"]'
+    free_driver_path = pb[target_ctrl].path_from_id() + '["free"]'
 
     # Constraints
     # Mind's eye tracks eye target control

Modified: trunk/blender/release/scripts/modules/rigify/eye_lid.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/eye_lid.py	2010-04-06 07:02:16 UTC (rev 28034)
+++ trunk/blender/release/scripts/modules/rigify/eye_lid.py	2010-04-06 07:49:10 UTC (rev 28035)
@@ -355,7 +355,7 @@
     prop["min"] = 0.0
     prop["max"] = 1.0
 
-    close_driver_path = pb[upper_lid_ctrl].path_to_id() + '["close_action"]'
+    close_driver_path = pb[upper_lid_ctrl].path_from_id() + '["close_action"]'
 
     # Constraints
 

Modified: trunk/blender/release/scripts/modules/rigify/finger_curl.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/finger_curl.py	2010-04-06 07:02:16 UTC (rev 28034)
+++ trunk/blender/release/scripts/modules/rigify/finger_curl.py	2010-04-06 07:49:10 UTC (rev 28035)
@@ -280,7 +280,7 @@
         con.target = obj
         con.subtarget = bb[org_f1].parent.name
 
-        hinge_driver_path = pb[control].path_to_id() + '["hinge"]'
+        hinge_driver_path = pb[control].path_from_id() + '["hinge"]'
 
         fcurve = con.driver_add("influence", 0)
         driver = fcurve.driver
@@ -301,7 +301,7 @@
         con.subtarget = socket
 
     # Create the drivers for the driver bones (control bone scale rotates driver bones)
-    controller_path = pb[control].path_to_id() # 'pose.bones["%s"]' % control_bone_name
+    controller_path = pb[control].path_from_id() # 'pose.bones["%s"]' % control_bone_name
 
     i = 0
     for bone in [df2, df3]:

Modified: trunk/blender/release/scripts/modules/rigify/leg_biped.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/leg_biped.py	2010-04-06 07:02:16 UTC (rev 28034)
+++ trunk/blender/release/scripts/modules/rigify/leg_biped.py	2010-04-06 07:49:10 UTC (rev 28035)
@@ -349,7 +349,7 @@
     con.subtarget = mt.hips
 
     # add driver
-    hinge_driver_path = fk_chain.thigh_p.path_to_id() + '["hinge"]'
+    hinge_driver_path = fk_chain.thigh_p.path_from_id() + '["hinge"]'
 
     fcurve = con.driver_add("influence", 0)
     driver = fcurve.driver

Modified: trunk/blender/release/scripts/modules/rigify/leg_quadruped.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/leg_quadruped.py	2010-04-06 07:02:16 UTC (rev 28034)
+++ trunk/blender/release/scripts/modules/rigify/leg_quadruped.py	2010-04-06 07:49:10 UTC (rev 28035)
@@ -207,7 +207,7 @@
     prop["min"] = 0.0
     prop["max"] = 1.0
 
-    ik_driver_path = pb[ik_chain.foot].path_to_id() + '["ik"]'
+    ik_driver_path = pb[ik_chain.foot].path_from_id() + '["ik"]'
 
     # simple constraining of orig bones
     con = mt_chain.thigh_p.constraints.new('COPY_TRANSFORMS')
@@ -369,7 +369,7 @@
     prop["min"] = 0.0
     prop["max"] = 1.0
 
-    hinge_driver_path = pb[fk_chain.thigh].path_to_id() + '["hinge"]'
+    hinge_driver_path = pb[fk_chain.thigh].path_from_id() + '["hinge"]'
 
     fcurve = con.driver_add("influence", 0)
     driver = fcurve.driver

Modified: trunk/blender/release/scripts/modules/rigify/mouth.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/mouth.py	2010-04-06 07:02:16 UTC (rev 28034)
+++ trunk/blender/release/scripts/modules/rigify/mouth.py	2010-04-06 07:49:10 UTC (rev 28035)
@@ -448,7 +448,7 @@
     prop["min"] = 0.0
     prop["max"] = 1.0
 
-    open_driver_path = pb[lip1].path_to_id() + '["open_action"]'
+    open_driver_path = pb[lip1].path_from_id() + '["open_action"]'
 
 
     # Constraints

Modified: trunk/blender/release/scripts/modules/rigify/neck_flex.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/neck_flex.py	2010-04-06 07:02:16 UTC (rev 28034)
+++ trunk/blender/release/scripts/modules/rigify/neck_flex.py	2010-04-06 07:49:10 UTC (rev 28035)
@@ -237,7 +237,7 @@
     con.subtarget = mt.body
 
     # add driver
-    hinge_driver_path = ex.head_ctrl_p.path_to_id() + '["hinge"]'
+    hinge_driver_path = ex.head_ctrl_p.path_from_id() + '["hinge"]'
 
     fcurve = con.driver_add("influence", 0)
     driver = fcurve.driver
@@ -254,7 +254,7 @@
     mod.coefficients[0] = 1.0
     mod.coefficients[1] = -1.0
 
-    head_driver_path = ex.head_ctrl_p.path_to_id()
+    head_driver_path = ex.head_ctrl_p.path_from_id()
 
     target_names = [("b%.2d" % (i + 1)) for i in range(len(neck_chain))]
 

Modified: trunk/blender/release/scripts/modules/rigify/palm_curl.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/palm_curl.py	2010-04-06 07:02:16 UTC (rev 28034)
+++ trunk/blender/release/scripts/modules/rigify/palm_curl.py	2010-04-06 07:49:10 UTC (rev 28035)
@@ -156,7 +156,7 @@
     driver_fcurves = pinky_pbone.driver_add("rotation_euler")
 
 
-    controller_path = control_pbone.path_to_id()
+    controller_path = control_pbone.path_from_id()
 
     # add custom prop
     control_pbone["spread"] = 0.0

Modified: trunk/blender/release/scripts/modules/rigify/spine_pivot_flex.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/spine_pivot_flex.py	2010-04-06 07:02:16 UTC (rev 28034)
+++ trunk/blender/release/scripts/modules/rigify/spine_pivot_flex.py	2010-04-06 07:49:10 UTC (rev 28035)
@@ -301,7 +301,7 @@
     var.name = "var"
     var.targets[0].id_type = 'OBJECT'
     var.targets[0].id = obj
-    var.targets[0].data_path = ex.ribcage_copy_p.path_to_id() + '["hinge"]'
+    var.targets[0].data_path = ex.ribcage_copy_p.path_from_id() + '["hinge"]'
 
     mod = fcurve.modifiers[0]
     mod.poly_order = 1
@@ -347,7 +347,7 @@
 
     # Constrain 'inbetween' bones
     target_names = [("b%.2d" % (i + 1)) for i in range(spine_chain_len - 1)]
-    rib_driver_path = ex.ribcage_copy_p.path_to_id()
+    rib_driver_path = ex.ribcage_copy_p.path_from_id()
 
     ex.ribcage_copy_p["bend_tot"] = 0.0
     fcurve = ex.ribcage_copy_p.driver_add('["bend_tot"]', 0)

Modified: trunk/blender/release/scripts/modules/rigify/tail_control.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/tail_control.py	2010-04-06 07:02:16 UTC (rev 28034)
+++ trunk/blender/release/scripts/modules/rigify/tail_control.py	2010-04-06 07:49:10 UTC (rev 28035)
@@ -133,7 +133,7 @@
     con_h.subtarget = hinge1
 
     # Add drivers
-    bone_path = pb[bones[0]].path_to_id()
+    bone_path = pb[bones[0]].path_from_id()
 
     driver_fcurve = con_f.driver_add("influence", 0)
     driver = driver_fcurve.driver

Modified: trunk/blender/release/scripts/modules/rigify_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify_utils.py	2010-04-06 07:02:16 UTC (rev 28034)
+++ trunk/blender/release/scripts/modules/rigify_utils.py	2010-04-06 07:49:10 UTC (rev 28035)
@@ -136,7 +136,7 @@
         prop["soft_min"] = 0.0
         prop["soft_max"] = 1.0
 
-    driver_path = prop_pbone.path_to_id() + ('["%s"]' % target_prop)
+    driver_path = prop_pbone.path_from_id() + ('["%s"]' % target_prop)
 
     def blend_target(driver):
         var = driver.variables.new()

Modified: trunk/blender/source/blender/python/doc/sphinx_doc_gen.py
===================================================================
--- trunk/blender/source/blender/python/doc/sphinx_doc_gen.py	2010-04-06 07:02:16 UTC (rev 28034)
+++ trunk/blender/source/blender/python/doc/sphinx_doc_gen.py	2010-04-06 07:49:10 UTC (rev 28035)
@@ -481,7 +481,7 @@
 
         # c/python methods, only for the base class
         if struct.identifier == "Struct":
-            for attribute, descr in bpy.types.Struct.__bases__[0].__dict__.items():
+            for attribute, descr in sorted(bpy.types.Struct.__bases__[0].__dict__.items()):
                 if type(descr) == MethodDescriptorType: # GetSetDescriptorType, GetSetDescriptorType's are not documented yet
                     if descr.__doc__:
                         write_indented_lines("   ", fw, descr.__doc__, False)

Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c	2010-04-06 07:02:16 UTC (rev 28034)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c	2010-04-06 07:49:10 UTC (rev 28035)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list