[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31208] trunk/blender: include rna parent class names in renaming list
Campbell Barton
ideasman42 at gmail.com
Tue Aug 10 08:27:30 CEST 2010
Revision: 31208
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31208
Author: campbellbarton
Date: 2010-08-10 08:27:29 +0200 (Tue, 10 Aug 2010)
Log Message:
-----------
include rna parent class names in renaming list
Modified Paths:
--------------
trunk/blender/release/scripts/modules/rna_info.py
trunk/blender/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
trunk/blender/source/blender/makesrna/rna_cleanup/rna_properties.txt
Modified: trunk/blender/release/scripts/modules/rna_info.py
===================================================================
--- trunk/blender/release/scripts/modules/rna_info.py 2010-08-10 05:41:51 UTC (rev 31207)
+++ trunk/blender/release/scripts/modules/rna_info.py 2010-08-10 06:27:29 UTC (rev 31208)
@@ -625,18 +625,23 @@
if __name__ == "__main__":
import rna_info
struct = rna_info.BuildRNAInfo()[0]
- data = ""
+ data = []
for struct_id, v in sorted(struct.items()):
- struct_id_str = "".join(sid for sid in struct_id if struct_id)
+ struct_id_str = v.identifier # "".join(sid for sid in struct_id if struct_id)
+
+ for base in v.get_bases():
+ struct_id_str = base.identifier + "|" + struct_id_str
+
props = [(prop.identifier, prop) for prop in v.properties]
-
for prop_id, prop in sorted(props):
# if prop.type == 'boolean':
# continue
- data += "%s.%s -> %s: %s%s %s\n" % (struct_id_str, prop.identifier, prop.identifier, prop.type, ", (read-only)" if prop.is_readonly else "", prop.description)
+ data.append("%s.%s -> %s: %s%s %s" % (struct_id_str, prop.identifier, prop.identifier, prop.type, ", (read-only)" if prop.is_readonly else "", prop.description))
+ data.sort()
if bpy.app.background:
- print(data)
+ import sys
+ sys.stderr.write("\n".join(data))
else:
text = bpy.data.texts.new(name="api.py")
text.from_string(data)
Modified: trunk/blender/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
===================================================================
--- trunk/blender/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py 2010-08-10 05:41:51 UTC (rev 31207)
+++ trunk/blender/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py 2010-08-10 06:27:29 UTC (rev 31208)
@@ -9,7 +9,7 @@
def main():
def work_line_id(line):
- return line[2], line[3] # class/from
+ return line[2].split("|")[-1], line[3] # class/from
if not (sys.argv[-1].endswith(".py") and sys.argv[-2].endswith(".py")):
@@ -31,6 +31,12 @@
except:
# print("not found", key)
val = val_orig
+
+ # always take the class from the base
+ val = list(val)
+ val[2] = val_orig[2]
+ print(val_orig[2])
+ val = tuple(val)
rna_api_new.append(val)
@@ -53,4 +59,4 @@
print("Warning '%s' contains lost %d items from module %s.py" % (file_path, len(mod_from_dict), mod_from.__name__))
if __name__ == "__main__":
- main()
\ No newline at end of file
+ main()
Modified: trunk/blender/source/blender/makesrna/rna_cleanup/rna_properties.txt
===================================================================
--- trunk/blender/source/blender/makesrna/rna_cleanup/rna_properties.txt 2010-08-10 05:41:51 UTC (rev 31207)
+++ trunk/blender/source/blender/makesrna/rna_cleanup/rna_properties.txt 2010-08-10 06:27:29 UTC (rev 31208)
@@ -1,24 +1,4 @@
NOTE * CLASS.FROM -> TO: TYPE DESCRIPTION
-+ * Action.fcurves -> fcurves: collection, "'(read-only) The individual F-Curves that make up the Action'"
-+ * Action.groups -> groups: collection, "'(read-only) Convenient groupings of F-Curves'"
-+ * Action.pose_markers -> pose_markers: collection, "'(read-only) Markers specific to this Action, for labeling poses'"
-+ * ActionActuator.action -> action: pointer "'NO DESCRIPTION'"
-+ * ActionActuator.blendin -> frame_blend_in: int "'Number of frames of motion blending'"
-+ * ActionActuator.continue_last_frame -> use_continue_last_frame: boolean "'Restore last frame when switching on/off, otherwise play from the start each time'"
-+ * ActionActuator.frame_end -> frame_end: int "'NO DESCRIPTION'"
-+ * ActionActuator.frame_property -> frame_property: string '"Assign the action\'s current frame number to this property"'
-+ * ActionActuator.frame_start -> frame_start: int "'NO DESCRIPTION'"
-+ * ActionActuator.mode -> play_mode: enum "'Action playback type'"
-+ * ActionActuator.priority -> priority: int "'Execution priority - lower numbers will override actions with higher numbers. With 2 or more actions at once, the overriding channels must be lower in the stack'"
-+ * ActionActuator.property -> property: string "'Use this property to define the Action position'"
-+ * ActionConstraint.action -> action: pointer "'NO DESCRIPTION'"
-+ * ActionConstraint.frame_end -> frame_end: int "'Last frame of the Action to use'"
-+ * ActionConstraint.frame_start -> frame_start: int "'First frame of the Action to use'"
-+ * ActionConstraint.maximum -> max: float "'Maximum value for target channel range'"
-+ * ActionConstraint.minimum -> min: float "'Minimum value for target channel range'"
-+ * ActionConstraint.subtarget -> subtarget: string "'NO DESCRIPTION'"
-+ * ActionConstraint.target -> target: pointer "'Target Object'"
-+ * ActionConstraint.transform_channel -> transform_channel: enum "'Transformation channel from the target that is used to key the Action'"
+ * ActionGroup.channels -> channels: collection, "'(read-only) F-Curves in this group'"
+ * ActionGroup.custom_color -> custom_color: int "'Index of custom color set'"
+ * ActionGroup.expanded -> show_expanded: boolean "'Action Group is expanded'"
@@ -29,7 +9,169 @@
+ * Actuator.name -> name: string "'NO DESCRIPTION'"
+ * Actuator.pinned -> pinned: boolean "'Display when not linked to a visible states controller'"
+ * Actuator.type -> type: enum "'NO DESCRIPTION'"
-+ * ActuatorSensor.actuator -> actuator: string "'Actuator name, actuator active state modifications will be detected'"
++ * Actuator|ActionActuator.action -> action: pointer "'NO DESCRIPTION'"
++ * Actuator|ActionActuator.blendin -> frame_blend_in: int "'Number of frames of motion blending'"
++ * Actuator|ActionActuator.continue_last_frame -> use_continue_last_frame: boolean "'Restore last frame when switching on/off, otherwise play from the start each time'"
++ * Actuator|ActionActuator.frame_end -> frame_end: int "'NO DESCRIPTION'"
++ * Actuator|ActionActuator.frame_property -> frame_property: string '"Assign the action\'s current frame number to this property"'
++ * Actuator|ActionActuator.frame_start -> frame_start: int "'NO DESCRIPTION'"
++ * Actuator|ActionActuator.mode -> play_mode: enum "'Action playback type'"
++ * Actuator|ActionActuator.priority -> priority: int "'Execution priority - lower numbers will override actions with higher numbers. With 2 or more actions at once, the overriding channels must be lower in the stack'"
++ * Actuator|ActionActuator.property -> property: string "'Use this property to define the Action position'"
++ * Actuator|ArmatureActuator.bone -> bone: string "'Bone on which the constraint is defined'"
++ * Actuator|ArmatureActuator.constraint -> constraint: string "'Name of the constraint you want to control'"
++ * Actuator|ArmatureActuator.mode -> mode: enum "'NO DESCRIPTION'"
++ * Actuator|ArmatureActuator.secondary_target -> secondary_target: pointer "'Set weight of this constraint'"
++ * Actuator|ArmatureActuator.target -> target: pointer "'Set this object as the target of the constraint'"
++ * Actuator|ArmatureActuator.weight -> weight: float "'Set weight of this constraint'"
++ * Actuator|CameraActuator.axis -> axis: enum "'Specify the axis the Camera will try to get behind'"
++ * Actuator|CameraActuator.height -> height: float "'NO DESCRIPTION'"
++ * Actuator|CameraActuator.max -> max: float "'NO DESCRIPTION'"
++ * Actuator|CameraActuator.min -> min: float "'NO DESCRIPTION'"
++ * Actuator|CameraActuator.object -> object: pointer "'Look at this Object'"
+Actuator|ConstraintActuator.damping -> damping: int "'Damping factor: time constant (in frame) of low pass filter'"
+Actuator|ConstraintActuator.damping_rotation -> damping_rotation: int "'Use a different damping for orientation'"
+Actuator|ConstraintActuator.detect_material -> use_material_detect: boolean "'Detect material instead of property'"
+Actuator|ConstraintActuator.direction -> direction: enum "'Set the direction of the ray'"
+Actuator|ConstraintActuator.direction_axis -> direction_axis: enum "'Select the axis to be aligned along the reference direction'"
+Actuator|ConstraintActuator.distance -> distance: float "'Set the maximum length of ray'"
+Actuator|ConstraintActuator.fh_damping -> fh_damping: float "'Damping factor of the Fh spring force'"
+Actuator|ConstraintActuator.fh_height -> fh_height: float "'Height of the Fh area'"
+Actuator|ConstraintActuator.fh_normal -> use_fh_normal: boolean "'Add a horizontal spring force on slopes'"
+Actuator|ConstraintActuator.fh_paralel_axis -> use_fh_paralel_axis: boolean "'Keep object axis parallel to normal'"
+Actuator|ConstraintActuator.force_distance -> use_force_distance: boolean "'Force distance of object to point of impact of ray'"
+Actuator|ConstraintActuator.limit -> limit: enum "'NO DESCRIPTION'"
+Actuator|ConstraintActuator.limit_max -> limit_max: float "'NO DESCRIPTION'"
+Actuator|ConstraintActuator.limit_min -> limit_min: float "'NO DESCRIPTION'"
+Actuator|ConstraintActuator.local -> use_local: boolean '"Set ray along object\'s axis or global axis"'
+Actuator|ConstraintActuator.material -> material: string "'Ray detects only Objects with this material'"
+Actuator|ConstraintActuator.max_angle -> angle_max: float "'Maximum angle (in degree) allowed with target direction. No correction is done if angle with target direction is between min and max'"
+Actuator|ConstraintActuator.max_rotation -> rotation_max: float "'Reference Direction'"
+Actuator|ConstraintActuator.min_angle -> angle_min: float "'Minimum angle (in degree) to maintain with target direction. No correction is done if angle with target direction is between min and max'"
+Actuator|ConstraintActuator.mode -> mode: enum "'The type of the constraint'"
+Actuator|ConstraintActuator.normal -> use_normal: boolean "'Set object axis along (local axis) or parallel (global axis) to the normal at hit position'"
+Actuator|ConstraintActuator.persistent -> use_persistent: boolean "'Persistent actuator: stays active even if ray does not reach target'"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list