Revision: 30278 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30278 Author: blendix Date: 2010-07-13 19:11:50 +0200 (Tue, 13 Jul 2010)
Log Message: ----------- RNA cleanup: review of booleans done. Modified Paths: -------------- trunk/blender/source/blender/makesrna/intern/rna_object.c trunk/blender/source/blender/makesrna/intern/rna_particle.c trunk/blender/source/blender/makesrna/intern/rna_space.c trunk/blender/source/blender/makesrna/rna_cleanup/rna_booleans.txt Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c =================================================================== --- trunk/blender/source/blender/makesrna/intern/rna_object.c 2010-07-13 16:53:17 UTC (rev 30277) +++ trunk/blender/source/blender/makesrna/intern/rna_object.c 2010-07-13 17:11:50 UTC (rev 30278) @@ -2116,11 +2116,6 @@ RNA_def_property_ui_text(prop, "Selected", "Object base selection state"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Base_select_update"); - prop= RNA_def_property(srna, "selected_user", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", BA_WAS_SEL); - RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, "User Selected", "Object base user selection state, used to restore user selection after transformations"); - RNA_api_object_base(srna); } Modified: trunk/blender/source/blender/makesrna/intern/rna_particle.c =================================================================== --- trunk/blender/source/blender/makesrna/intern/rna_particle.c 2010-07-13 16:53:17 UTC (rev 30277) +++ trunk/blender/source/blender/makesrna/intern/rna_particle.c 2010-07-13 17:11:50 UTC (rev 30278) @@ -888,18 +888,16 @@ // int totkey; /* flag */ - prop= RNA_def_property(srna, "unexist", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", PARS_UNEXIST); - RNA_def_property_ui_text(prop, "unexist", ""); + prop= RNA_def_property(srna, "is_existing", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", PARS_UNEXIST); + RNA_def_property_clear_flag(prop, PROP_EDITABLE); + RNA_def_property_ui_text(prop, "Exists", ""); - prop= RNA_def_property(srna, "no_disp", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", PARS_NO_DISP); - RNA_def_property_ui_text(prop, "no_disp", ""); + prop= RNA_def_property(srna, "is_visible", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", PARS_NO_DISP); + RNA_def_property_clear_flag(prop, PROP_EDITABLE); + RNA_def_property_ui_text(prop, "Visible", ""); - prop= RNA_def_property(srna, "rekey", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", PARS_REKEY); - RNA_def_property_ui_text(prop, "rekey", ""); - prop= RNA_def_property(srna, "alive_state", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "alive"); RNA_def_property_enum_items(prop, alive_items); @@ -1133,11 +1131,6 @@ RNA_def_property_ui_text(prop, "Multi React", "React multiple times"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - /* TODO: used somewhere? */ - prop= RNA_def_property(srna, "hair_geometry", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_HAIR_GEOMETRY); - RNA_def_property_ui_text(prop, "Hair Geometry", "");//TODO: tooltip - prop= RNA_def_property(srna, "unborn", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_UNBORN); RNA_def_property_ui_text(prop, "Unborn", "Show particles before they are emitted"); @@ -1224,11 +1217,6 @@ //RNA_def_property_ui_text(prop, "Use seams", "Use seams to determine parents"); //RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - /* TODO: used somewhere? */ - prop= RNA_def_property(srna, "child_render", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_CHILD_RENDER); - RNA_def_property_ui_text(prop, "child_render", ""); - prop= RNA_def_property(srna, "child_guide", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_CHILD_GUIDE); RNA_def_property_ui_text(prop, "child_guide", ""); Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c =================================================================== --- trunk/blender/source/blender/makesrna/intern/rna_space.c 2010-07-13 16:53:17 UTC (rev 30277) +++ trunk/blender/source/blender/makesrna/intern/rna_space.c 2010-07-13 17:11:50 UTC (rev 30278) @@ -1638,7 +1638,7 @@ /* editing */ prop= RNA_def_property(srna, "automerge_keyframes", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SACTION_NOTRANSKEYCULL); - RNA_def_property_ui_text(prop, "AutoMerge Keyframes", "Show handles of Bezier control points"); + RNA_def_property_ui_text(prop, "AutoMerge Keyframes", "Automatically merge nearby keyframes"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_DOPESHEET, NULL); prop= RNA_def_property(srna, "realtime_updates", PROP_BOOLEAN, PROP_NONE); @@ -1731,7 +1731,7 @@ /* editing */ prop= RNA_def_property(srna, "automerge_keyframes", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SIPO_NOTRANSKEYCULL); - RNA_def_property_ui_text(prop, "AutoMerge Keyframes", "Show handles of Bezier control points"); + RNA_def_property_ui_text(prop, "AutoMerge Keyframes", "Automatically merge nearby keyframes"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL); prop= RNA_def_property(srna, "realtime_updates", PROP_BOOLEAN, PROP_NONE); Modified: trunk/blender/source/blender/makesrna/rna_cleanup/rna_booleans.txt =================================================================== --- trunk/blender/source/blender/makesrna/rna_cleanup/rna_booleans.txt 2010-07-13 16:53:17 UTC (rev 30277) +++ trunk/blender/source/blender/makesrna/rna_cleanup/rna_booleans.txt 2010-07-13 17:11:50 UTC (rev 30278) @@ -1,4 +1,4 @@ -TODO * ActionActuator.continue_last_frame -> continue_last_frame: boolean Restore last frame when switching on/off, otherwise play from the start each time +ActionActuator.continue_last_frame -> use_continue_last_frame: boolean Restore last frame when switching on/off, otherwise play from the start each time ActionGroup.expanded -> show_expanded: boolean Action Group is expanded ActionGroup.locked -> lock: boolean Action Group is locked ActionGroup.selected -> select: boolean Action Group is selected @@ -16,30 +16,30 @@ AreaLamp.shadow_layer -> use_shadow_layer: boolean Causes only objects on the same layer to cast shadows AreaLamp.umbra -> use_umbra: boolean Emphasize parts that are fully shadowed (Constant Jittered sampling) Armature.auto_ik -> use_auto_ik: boolean Add temporaral IK constraints while grabbing bones in Pose Mode -TODO * Armature.deform_envelope -> use_deform_envelope: boolean Enable Bone Envelopes when defining deform -TODO * Armature.deform_quaternion -> use_deform_quaternion: boolean Enable deform rotation with Quaternions -TODO * Armature.deform_vertexgroups -> use_deform_vertexgroups: boolean Enable Vertex Groups when defining deform -TODO * Armature.delay_deform -> use_deform_delay: boolean Don't deform children when manipulating bones in Pose Mode +Armature.deform_envelope -> use_deform_envelopes: boolean Enable Bone Envelopes when defining deform +Armature.deform_quaternion -> use_deform_preserve_volume: boolean Deform rotation interpolation with quaternions +Armature.deform_vertexgroups -> use_deform_vertex_groups: boolean Enable Vertex Groups when defining deform +Armature.delay_deform -> use_deform_delay: boolean Don't deform children when manipulating bones in Pose Mode Armature.draw_axes -> show_axes: boolean Draw bone axes Armature.draw_custom_bone_shapes -> show_bone_custom_shapes: boolean Draw bones with their custom shapes Armature.draw_group_colors -> show_group_colors: boolean Draw bone group colors Armature.draw_names -> show_names: boolean Draw bone names -TODO * Armature.ghost_only_selected -> show_only_ghost_selected: boolean +Armature.show_ghost_only_selected -> show_only_ghost_selected: boolean Armature.layer -> layer: boolean Armature layer visibility Armature.layer_protection -> layer_protected: boolean Protected layers in Proxy Instances are restored to Proxy settings on file reload and undo Armature.x_axis_mirror -> use_mirror_x: boolean Apply changes to matching bone on opposite side of X-Axis ArmatureModifier.invert -> invert_vertex_group: boolean Invert vertex group influence -TODO * ArmatureModifier.multi_modifier -> use_multi_modifier: boolean Use same input as previous modifier, and mix results using overall vgroup -TODO * ArmatureModifier.quaternion -> use_preserve_volume: boolean Deform rotation interpolation with quaternions -TODO * ArmatureModifier.use_bone_envelopes -> use_bone_envelopes: boolean -TODO * ArmatureModifier.use_vertex_groups -> use_vertex_groups: boolean +ArmatureModifier.multi_modifier -> use_multi_modifier: boolean Use same input as previous modifier, and mix results using overall vgroup +ArmatureModifier.quaternion -> use_deform_preserve_volume: boolean Deform rotation interpolation with quaternions +ArmatureModifier.use_deform_envelopes -> use_deform_envelopes: boolean +ArmatureModifier.use_deform_vertex_groups -> use_deform_vertex_groups: boolean ArrayModifier.add_offset_object -> use_object_offset: boolean Add another object's transformation to the total offset ArrayModifier.constant_offset -> use_constant_offset: boolean Add a constant offset -TODO * ArrayModifier.merge_adjacent_vertices -> use_merge_vertex: boolean Merge vertices in adjacent duplicates -TODO * ArrayModifier.merge_end_vertices -> use_merge_vertex_end: boolean Merge vertices in first and last duplicates +ArrayModifier.merge_adjacent_vertices -> use_merge_adjacent_vertices: boolean Merge vertices in adjacent duplicates +ArrayModifier.merge_end_vertices -> use_merge_end_vertices: boolean Merge vertices in first and last duplicates ArrayModifier.relative_offset -> use_relative_offset: boolean Add an offset relative to the object's bounding box BackgroundImage.show_expanded -> show_expanded: boolean Show the expanded in the user interface -TODO * BevelModifier.only_vertices -> use_only_vertex: boolean Bevel verts/corners, not edges +BevelModifier.only_vertices -> use_only_vertices: boolean Bevel verts/corners, not edges BezierSplinePoint.hidden -> hide: boolean Visibility status @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs