From f32a35fd9dd5e412275353ee78f0c17e975fdbb7 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 18 Aug 2010 03:24:52 +0000 Subject: apply rna naming for ToolSettings --- source/blender/editors/transform/transform.c | 4 +-- .../blender/editors/transform/transform_generics.c | 4 +-- source/blender/editors/transform/transform_ops.c | 2 +- source/blender/editors/transform/transform_snap.c | 4 +-- source/blender/makesrna/intern/rna_scene.c | 38 ++++++++++---------- .../makesrna/rna_cleanup/rna_properties.txt | 40 +++++++++++----------- 6 files changed, 46 insertions(+), 46 deletions(-) (limited to 'source') diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index a450222dd95..de50861259d 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1392,7 +1392,7 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op) ts->proportional_size = t->prop_size; } - if (RNA_struct_find_property(op->ptr, "proportional_editing_falloff") && !RNA_property_is_set(op->ptr, "proportional_editing_falloff")) { + if (RNA_struct_find_property(op->ptr, "proportional_edit_falloff") && !RNA_property_is_set(op->ptr, "proportional_edit_falloff")) { ts->prop_mode = t->prop_mode; } @@ -1415,7 +1415,7 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op) if (RNA_struct_find_property(op->ptr, "proportional")) { RNA_enum_set(op->ptr, "proportional", proportional); - RNA_enum_set(op->ptr, "proportional_editing_falloff", t->prop_mode); + RNA_enum_set(op->ptr, "proportional_edit_falloff", t->prop_mode); RNA_float_set(op->ptr, "proportional_size", t->prop_size); } diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 56a4eb846c0..15e2d32cc94 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1073,9 +1073,9 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event) t->prop_size = 1.0f; } - if (op && RNA_struct_find_property(op->ptr, "proportional_editing_falloff") && RNA_property_is_set(op->ptr, "proportional_editing_falloff")) + if (op && RNA_struct_find_property(op->ptr, "proportional_edit_falloff") && RNA_property_is_set(op->ptr, "proportional_edit_falloff")) { - t->prop_mode = RNA_enum_get(op->ptr, "proportional_editing_falloff"); + t->prop_mode = RNA_enum_get(op->ptr, "proportional_edit_falloff"); } else { diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index 76866d9a0dc..4cecc41ae5f 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -421,7 +421,7 @@ void Transform_Properties(struct wmOperatorType *ot, int flags) if (flags & P_PROPORTIONAL) { RNA_def_enum(ot->srna, "proportional", proportional_editing_items, 0, "Proportional Editing", ""); - RNA_def_enum(ot->srna, "proportional_editing_falloff", proportional_falloff_items, 0, "Proportional Editing Falloff", "Falloff type for proportional editing mode."); + RNA_def_enum(ot->srna, "proportional_edit_falloff", proportional_falloff_items, 0, "Proportional Editing Falloff", "Falloff type for proportional editing mode."); RNA_def_float(ot->srna, "proportional_size", 1, 0, FLT_MAX, "Proportional Size", "", 0, 100); } diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index d244b2f6b30..778698d3060 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -440,9 +440,9 @@ void initSnapping(TransInfo *t, wmOperator *op) normalize_v3(t->tsnap.snapNormal); } - if (RNA_struct_find_property(op->ptr, "snap_project")) + if (RNA_struct_find_property(op->ptr, "use_snap_project")) { - t->tsnap.project = RNA_boolean_get(op->ptr, "snap_project"); + t->tsnap.project = RNA_boolean_get(op->ptr, "use_snap_project"); } } } diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index a8e965c4f85..2a3a2a25574 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -987,7 +987,7 @@ static void rna_def_tool_settings(BlenderRNA *brna) RNA_def_property_struct_type(prop, "Sculpt"); RNA_def_property_ui_text(prop, "Sculpt", ""); - prop = RNA_def_property(srna, "auto_normalize", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_auto_normalize", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "auto_normalize", 1); RNA_def_property_ui_text(prop, "WPaint Auto-Normalize", "Ensure all bone-deforming vertex groups add up to 1.0 while " @@ -1010,19 +1010,19 @@ static void rna_def_tool_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Particle Edit", ""); /* Transform */ - prop= RNA_def_property(srna, "proportional_editing", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "proportional_edit", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "proportional"); RNA_def_property_enum_items(prop, proportional_editing_items); RNA_def_property_ui_text(prop, "Proportional Editing", "Proportional editing mode"); RNA_def_property_update(prop, NC_SCENE|ND_TOOLSETTINGS, NULL); /* header redraw */ - prop= RNA_def_property(srna, "proportional_editing_objects", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_proportional_edit_objects", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "proportional_objects", 0); RNA_def_property_ui_text(prop, "Proportional Editing Objects", "Proportional editing object mode"); RNA_def_property_ui_icon(prop, ICON_PROP_OFF, 1); RNA_def_property_update(prop, NC_SCENE|ND_TOOLSETTINGS, NULL); /* header redraw */ - prop= RNA_def_property(srna, "proportional_editing_falloff", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "proportional_edit_falloff", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "prop_mode"); RNA_def_property_enum_items(prop, proportional_falloff_items); RNA_def_property_ui_text(prop, "Proportional Editing Falloff", "Falloff type for proportional editing mode"); @@ -1035,17 +1035,17 @@ static void rna_def_tool_settings(BlenderRNA *brna) RNA_def_property_ui_range(prop, 0.01, 10.0, 10.0, 2); RNA_def_property_update(prop, NC_GEOM|ND_DATA, NULL); - prop= RNA_def_property(srna, "automerge_editing", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_mesh_automerge", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "automerge", 0); RNA_def_property_ui_text(prop, "AutoMerge Editing", "Automatically merge vertices moved to the same location"); - prop= RNA_def_property(srna, "snap", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_snap", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "snap_flag", SCE_SNAP); RNA_def_property_ui_text(prop, "Snap", "Snap during transform"); RNA_def_property_ui_icon(prop, ICON_SNAP_OFF, 1); RNA_def_property_update(prop, NC_SCENE|ND_TOOLSETTINGS, NULL); /* header redraw */ - prop= RNA_def_property(srna, "snap_align_rotation", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_snap_align_rotation", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "snap_flag", SCE_SNAP_ROTATE); RNA_def_property_ui_text(prop, "Snap Align Rotation", "Align rotation with the snapping target"); RNA_def_property_ui_icon(prop, ICON_SNAP_NORMAL, 0); @@ -1063,41 +1063,41 @@ static void rna_def_tool_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Snap Target", "Which part to snap onto the target"); RNA_def_property_update(prop, NC_SCENE|ND_TOOLSETTINGS, NULL); /* header redraw */ - prop= RNA_def_property(srna, "snap_peel_object", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_snap_peel_object", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "snap_flag", SCE_SNAP_PEEL_OBJECT); RNA_def_property_ui_text(prop, "Snap Peel Object", "Consider objects as whole when finding volume center"); RNA_def_property_ui_icon(prop, ICON_SNAP_PEEL_OBJECT, 0); RNA_def_property_update(prop, NC_SCENE|ND_TOOLSETTINGS, NULL); /* header redraw */ - prop= RNA_def_property(srna, "snap_project", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_snap_project", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "snap_flag", SCE_SNAP_PROJECT); RNA_def_property_ui_text(prop, "Project Individual Elements", "Project vertices on the surface of other objects"); RNA_def_property_ui_icon(prop, ICON_RETOPO, 0); RNA_def_property_update(prop, NC_SCENE|ND_TOOLSETTINGS, NULL); /* header redraw */ /* Auto Keying */ - prop= RNA_def_property(srna, "use_auto_keying", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_keyframe_insert_auto", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "autokey_mode", AUTOKEY_ON); RNA_def_property_ui_text(prop, "Auto Keying", "Automatic keyframe insertion for Objects and Bones"); RNA_def_property_ui_icon(prop, ICON_REC, 0); - prop= RNA_def_property(srna, "autokey_mode", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "auto_keying_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "autokey_mode"); RNA_def_property_enum_items(prop, auto_key_items); RNA_def_property_ui_text(prop, "Auto-Keying Mode", "Mode of automatic keyframe insertion for Objects and Bones"); - prop= RNA_def_property(srna, "record_with_nla", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_record_with_nla", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "autokey_flag", ANIMRECORD_FLAG_WITHNLA); RNA_def_property_ui_text(prop, "Layered", "Add a new NLA Track + Strip for every loop/pass made over the animation to allow non-destructive tweaking"); /* UV */ - prop= RNA_def_property(srna, "uv_selection_mode", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "uv_select_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "uv_selectmode"); RNA_def_property_enum_items(prop, uv_select_mode_items); RNA_def_property_ui_text(prop, "UV Selection Mode", "UV selection and display mode"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); - prop= RNA_def_property(srna, "uv_sync_selection", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_uv_select_sync", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uv_flag", UV_SYNC_SELECTION); RNA_def_property_ui_text(prop, "UV Sync Selection", "Keep UV and edit mode mesh selection in sync"); RNA_def_property_ui_icon(prop, ICON_EDIT, 0); @@ -1109,7 +1109,7 @@ static void rna_def_tool_settings(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); /* Mesh */ - prop= RNA_def_property(srna, "mesh_selection_mode", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "mesh_select_mode", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "selectmode", 1); RNA_def_property_array(prop, 3); RNA_def_property_boolean_funcs(prop, NULL, "rna_Scene_editmesh_select_mode_set"); @@ -1127,20 +1127,20 @@ static void rna_def_tool_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Edge Tag Mode", "The edge flag to tag when selecting the shortest path"); /* etch-a-ton */ - prop= RNA_def_property(srna, "bone_sketching", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_bone_sketching", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "bone_sketching", BONE_SKETCHING); RNA_def_property_ui_text(prop, "Use Bone Sketching", "DOC BROKEN"); // RNA_def_property_ui_icon(prop, ICON_EDIT, 0); - prop= RNA_def_property(srna, "etch_quick", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_etch_quick", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "bone_sketching", BONE_SKETCHING_QUICK); RNA_def_property_ui_text(prop, "Quick Sketching", "DOC BROKEN"); - prop= RNA_def_property(srna, "etch_overdraw", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_etch_overdraw", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "bone_sketching", BONE_SKETCHING_ADJUST); RNA_def_property_ui_text(prop, "Overdraw Sketching", "DOC BROKEN"); - prop= RNA_def_property(srna, "etch_autoname", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_etch_autoname", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "skgen_retarget_options", SK_RETARGET_AUTONAME); RNA_def_property_ui_text(prop, "Autoname", "DOC BROKEN"); diff --git a/source/blender/makesrna/rna_cleanup/rna_properties.txt b/source/blender/makesrna/rna_cleanup/rna_properties.txt index 5cd5fa60017..09e873268e1 100644 --- a/source/blender/makesrna/rna_cleanup/rna_properties.txt +++ b/source/blender/makesrna/rna_cleanup/rna_properties.txt @@ -4350,7 +4350,7 @@ #+ * TimelineMarker.frame -> frame: int "The frame on which the timeline marker appears" #+ * TimelineMarker.name -> name: string "NO DESCRIPTION" #+ * TimelineMarker.select -> select: boolean "Marker selection state" - + * ToolSettings.autokey_mode -> auto_keying_mode: enum "Mode of automatic keyframe insertion for Objects and Bones" +#ToolSettings.auto_keying_mode -> auto_keying_mode: enum "Mode of automatic keyframe insertion for Objects and Bones" #+ * ToolSettings.edge_path_mode -> edge_path_mode: enum "The edge flag to tag when selecting the shortest path" #+ * ToolSettings.etch_adaptive_limit -> etch_adaptive_limit: float "Number of bones in the subdivided stroke" #+ * ToolSettings.etch_convert_mode -> etch_convert_mode: enum "Method used to convert stroke to bones" @@ -4361,32 +4361,32 @@ #+ * ToolSettings.etch_subdivision_number -> etch_subdivision_number: int "Number of bones in the subdivided stroke" #+ * ToolSettings.etch_template -> etch_template: pointer "Template armature that will be retargeted to the stroke" #+ * ToolSettings.image_paint -> image_paint: pointer, "(read-only)" - + * ToolSettings.mesh_selection_mode -> mesh_select_mode: boolean[3] "Which mesh elements selection works on" +#ToolSettings.mesh_select_mode -> mesh_select_mode: boolean[3] "Which mesh elements selection works on" #+ * ToolSettings.normal_size -> normal_size: float "Display size for normals in the 3D view" #+ * ToolSettings.particle_edit -> particle_edit: pointer, "(read-only)" - + * ToolSettings.proportional_editing -> proportional_edit: enum "Proportional editing mode" - + * ToolSettings.proportional_editing_falloff -> proportional_edit_falloff: enum "Falloff type for proportional editing mode" +#ToolSettings.proportional_edit -> proportional_edit: enum "Proportional editing mode" +#ToolSettings.proportional_edit_falloff -> proportional_edit_falloff: enum "Falloff type for proportional editing mode" #+ * ToolSettings.sculpt -> sculpt: pointer, "(read-only)" #+ * ToolSettings.sculpt_paint_use_unified_size -> sculpt_paint_use_unified_size: boolean "Instead of per brush radius, the radius is shared across brushes" #+ * ToolSettings.sculpt_paint_use_unified_strength -> sculpt_paint_use_unified_strength: boolean "Instead of per brush strength, the strength is shared across brushes" #ToolSettings.show_uv_local_view -> show_uv_local_view: boolean "Draw only faces with the currently displayed image assigned" #+ * ToolSettings.snap_element -> snap_element: enum "Type of element to snap to" #+ * ToolSettings.snap_target -> snap_target: enum "Which part to snap onto the target" - + * ToolSettings.auto_normalize -> use_auto_normalize: boolean "Ensure all bone-deforming vertex groups add up to 1.0 while weight painting" - + * ToolSettings.bone_sketching -> use_bone_sketching: boolean "DOC BROKEN" - + * ToolSettings.etch_autoname -> use_etch_autoname: boolean "DOC BROKEN" - + * ToolSettings.etch_overdraw -> use_etch_overdraw: boolean "DOC BROKEN" - + * ToolSettings.etch_quick -> use_etch_quick: boolean "DOC BROKEN" - + * ToolSettings.use_auto_keying -> use_keyframe_insert_auto: boolean "Automatic keyframe insertion for Objects and Bones" - + * ToolSettings.automerge_editing -> use_mesh_automerge: boolean "Automatically merge vertices moved to the same location" - + * ToolSettings.proportional_editing_objects -> use_proportional_edit_objects: boolean "Proportional editing object mode" - + * ToolSettings.record_with_nla -> use_record_with_nla: boolean "Add a new NLA Track + Strip for every loop/pass made over the animation to allow non-destructive tweaking" - + * ToolSettings.snap -> use_snap: boolean "Snap during transform" - + * ToolSettings.snap_align_rotation -> use_snap_align_rotation: boolean "Align rotation with the snapping target" - + * ToolSettings.snap_peel_object -> use_snap_peel_object: boolean "Consider objects as whole when finding volume center" - + * ToolSettings.snap_project -> use_snap_project: boolean "Project vertices on the surface of other objects" - + * ToolSettings.uv_sync_selection -> use_uv_select_sync: boolean "Keep UV and edit mode mesh selection in sync" - + * ToolSettings.uv_selection_mode -> uv_select_mode: enum "UV selection and display mode" +#ToolSettings.use_auto_normalize -> use_auto_normalize: boolean "Ensure all bone-deforming vertex groups add up to 1.0 while weight painting" +#ToolSettings.use_bone_sketching -> use_bone_sketching: boolean "DOC BROKEN" +#ToolSettings.use_etch_autoname -> use_etch_autoname: boolean "DOC BROKEN" +#ToolSettings.use_etch_overdraw -> use_etch_overdraw: boolean "DOC BROKEN" +#ToolSettings.use_etch_quick -> use_etch_quick: boolean "DOC BROKEN" +#ToolSettings.use_keyframe_insert_auto -> use_keyframe_insert_auto: boolean "Automatic keyframe insertion for Objects and Bones" +#ToolSettings.use_mesh_automerge -> use_mesh_automerge: boolean "Automatically merge vertices moved to the same location" +#ToolSettings.use_proportional_edit_objects -> use_proportional_edit_objects: boolean "Proportional editing object mode" +#ToolSettings.use_record_with_nla -> use_record_with_nla: boolean "Add a new NLA Track + Strip for every loop/pass made over the animation to allow non-destructive tweaking" +#ToolSettings.use_snap -> use_snap: boolean "Snap during transform" +#ToolSettings.use_snap_align_rotation -> use_snap_align_rotation: boolean "Align rotation with the snapping target" +#ToolSettings.use_snap_peel_object -> use_snap_peel_object: boolean "Consider objects as whole when finding volume center" +#ToolSettings.use_snap_project -> use_snap_project: boolean "Project vertices on the surface of other objects" +#ToolSettings.use_uv_select_sync -> use_uv_select_sync: boolean "Keep UV and edit mode mesh selection in sync" +#ToolSettings.uv_select_mode -> uv_select_mode: enum "UV selection and display mode" #+ * ToolSettings.vertex_group_weight -> vertex_group_weight: float "Weight to assign in vertex groups" #+ * ToolSettings.vertex_paint -> vertex_paint: pointer, "(read-only)" #+ * ToolSettings.weight_paint -> weight_paint: pointer, "(read-only)" @@ -4602,4 +4602,4 @@ + * WorldStarsSettings.color_randomization -> color_random: float "Randomize star colors" + * WorldStarsSettings.min_distance -> distance_min: float "Minimum distance to the camera for stars" #+ * WorldStarsSettings.size -> size: float "Average screen dimension of stars" -#+ * WorldStarsSettings.use_stars -> use_stars: boolean "Enable starfield generation[651121 refs]" +#+ * WorldStarsSettings.use_stars -> use_stars: boolean "Enable starfield generation[651123 refs]" -- cgit v1.2.3