diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-05-05 09:22:36 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-05 09:23:35 +0400 |
commit | b82d639f3dea92fa9be7e38c5e76617dc07251a9 (patch) | |
tree | 1bfa101f105ccc679ffb52fa34de1f333e4dda3e /source/blender/editors | |
parent | cf069afdfd11d8200a57cf8a4307d0e664ac4ecc (diff) |
Stop all dynamic enums using translations (from blend file data)
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/armature/pose_lib.c | 2 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 1 | ||||
-rw-r--r-- | source/blender/editors/object/object_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_group.c | 3 | ||||
-rw-r--r-- | source/blender/editors/object/object_hook.c | 5 | ||||
-rw-r--r-- | source/blender/editors/object/object_relations.c | 1 | ||||
-rw-r--r-- | source/blender/editors/object/object_vgroup.c | 2 | ||||
-rw-r--r-- | source/blender/editors/physics/rigidbody_object.c | 1 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 2 |
10 files changed, 18 insertions, 2 deletions
diff --git a/source/blender/editors/armature/pose_lib.c b/source/blender/editors/armature/pose_lib.c index fb510473b11..3f4f720ccdb 100644 --- a/source/blender/editors/armature/pose_lib.c +++ b/source/blender/editors/armature/pose_lib.c @@ -610,6 +610,7 @@ void POSELIB_OT_pose_remove(wmOperatorType *ot) /* properties */ prop = RNA_def_enum(ot->srna, "pose", DummyRNA_NULL_items, 0, "Pose", "The pose to remove"); RNA_def_enum_funcs(prop, poselib_stored_pose_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); ot->prop = prop; } @@ -699,6 +700,7 @@ void POSELIB_OT_pose_rename(wmOperatorType *ot) ot->prop = RNA_def_string(ot->srna, "name", "RenamedPose", 64, "New Pose Name", "New name for pose"); prop = RNA_def_enum(ot->srna, "pose", DummyRNA_NULL_items, 0, "Pose", "The pose to rename"); RNA_def_enum_funcs(prop, poselib_stored_pose_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); } /* ************************************************************* */ diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 45099166bf4..159eac4a275 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -2157,6 +2157,7 @@ void MESH_OT_blend_from_shape(wmOperatorType *ot) /* properties */ prop = RNA_def_enum(ot->srna, "shape", DummyRNA_NULL_items, 0, "Shape", "Shape key to use for blending"); RNA_def_enum_funcs(prop, shape_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); RNA_def_float(ot->srna, "blend", 1.0f, -FLT_MAX, FLT_MAX, "Blend", "Blending factor", -2.0f, 2.0f); RNA_def_boolean(ot->srna, "add", 1, "Add", "Add rather than blend between shapes"); } diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index fc669888081..b5d70225c43 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1864,7 +1864,7 @@ void OBJECT_OT_game_property_copy(wmOperatorType *ot) RNA_def_enum(ot->srna, "operation", game_properties_copy_operations, 3, "Operation", ""); prop = RNA_def_enum(ot->srna, "property", DummyRNA_NULL_items, 0, "Property", "Properties to copy"); - RNA_def_property_flag(prop, PROP_SKIP_SAVE); + RNA_def_property_flag(prop, PROP_SKIP_SAVE | PROP_ENUM_NO_TRANSLATE); RNA_def_enum_funcs(prop, gameprops_itemf); ot->prop = prop; } diff --git a/source/blender/editors/object/object_group.c b/source/blender/editors/object/object_group.c index 6c69fce8a8f..69bd64542f4 100644 --- a/source/blender/editors/object/object_group.c +++ b/source/blender/editors/object/object_group.c @@ -238,6 +238,7 @@ void GROUP_OT_objects_add_active(wmOperatorType *ot) /* properties */ prop = RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, "Group", "The group to add other selected objects to"); RNA_def_enum_funcs(prop, group_object_active_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); ot->prop = prop; } @@ -301,6 +302,7 @@ void GROUP_OT_objects_remove_active(wmOperatorType *ot) /* properties */ prop = RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, "Group", "The group to remove other selected objects from"); RNA_def_enum_funcs(prop, group_object_active_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); ot->prop = prop; } @@ -393,6 +395,7 @@ void GROUP_OT_objects_remove(wmOperatorType *ot) /* properties */ prop = RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, "Group", "The group to remove this object from"); RNA_def_enum_funcs(prop, group_object_active_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); ot->prop = prop; } diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index f26b8a34bd7..6407d2eb8b8 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -692,6 +692,7 @@ void OBJECT_OT_hook_remove(wmOperatorType *ot) /* properties */ prop = RNA_def_enum(ot->srna, "modifier", DummyRNA_NULL_items, 0, "Modifier", "Modifier number to remove"); RNA_def_enum_funcs(prop, hook_mod_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); ot->prop = prop; } @@ -735,6 +736,7 @@ void OBJECT_OT_hook_reset(wmOperatorType *ot) /* properties */ prop = RNA_def_enum(ot->srna, "modifier", DummyRNA_NULL_items, 0, "Modifier", "Modifier number to assign to"); RNA_def_enum_funcs(prop, hook_mod_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); } static int object_hook_recenter_exec(bContext *C, wmOperator *op) @@ -784,6 +786,7 @@ void OBJECT_OT_hook_recenter(wmOperatorType *ot) /* properties */ prop = RNA_def_enum(ot->srna, "modifier", DummyRNA_NULL_items, 0, "Modifier", "Modifier number to assign to"); RNA_def_enum_funcs(prop, hook_mod_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); } static int object_hook_assign_exec(bContext *C, wmOperator *op) @@ -843,6 +846,7 @@ void OBJECT_OT_hook_assign(wmOperatorType *ot) /* properties */ prop = RNA_def_enum(ot->srna, "modifier", DummyRNA_NULL_items, 0, "Modifier", "Modifier number to assign to"); RNA_def_enum_funcs(prop, hook_mod_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); } static int object_hook_select_exec(bContext *C, wmOperator *op) @@ -885,5 +889,6 @@ void OBJECT_OT_hook_select(wmOperatorType *ot) /* properties */ prop = RNA_def_enum(ot->srna, "modifier", DummyRNA_NULL_items, 0, "Modifier", "Modifier number to remove"); RNA_def_enum_funcs(prop, hook_mod_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); } diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index cd6fd54e72e..fc5f32b013d 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -422,6 +422,7 @@ void OBJECT_OT_proxy_make(wmOperatorType *ot) /* properties */ prop = RNA_def_enum(ot->srna, "object", DummyRNA_DEFAULT_items, 0, "Proxy Object", "Name of lib-linked/grouped object to make a proxy for"); /* XXX, relies on hard coded ID at the moment */ RNA_def_enum_funcs(prop, proxy_group_object_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); ot->prop = prop; } diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index f2cfc3ca935..ccc3e2e8278 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -862,6 +862,7 @@ static void vgroup_operator_subset_select_props(wmOperatorType *ot, bool use_act else { RNA_def_enum_funcs(prop, rna_vertex_group_select_itemf); } + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); ot->prop = prop; } @@ -4227,6 +4228,7 @@ void OBJECT_OT_vertex_group_set_active(wmOperatorType *ot) /* properties */ prop = RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, "Group", "Vertex group to set as active"); RNA_def_enum_funcs(prop, vgroup_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); ot->prop = prop; } diff --git a/source/blender/editors/physics/rigidbody_object.c b/source/blender/editors/physics/rigidbody_object.c index e4426fdbbf2..7ba37bbb76b 100644 --- a/source/blender/editors/physics/rigidbody_object.c +++ b/source/blender/editors/physics/rigidbody_object.c @@ -642,6 +642,7 @@ void RIGIDBODY_OT_mass_calculate(wmOperatorType *ot) "Material Preset", "Type of material that objects are made of (determines material density)"); RNA_def_enum_funcs(prop, rigidbody_materials_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); RNA_def_float(ot->srna, "density", 1.0, FLT_MIN, FLT_MAX, "Density", diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 77b18c13629..969c5a09a82 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -1273,6 +1273,7 @@ void PAINT_OT_weight_sample_group(wmOperatorType *ot) /* keyingset to use (dynamic enum) */ prop = RNA_def_enum(ot->srna, "group", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use"); RNA_def_enum_funcs(prop, weight_paint_sample_enum_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); ot->prop = prop; } diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index da456c21990..d18eab6da48 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -1065,7 +1065,7 @@ void VIEW3D_OT_select_menu(wmOperatorType *ot) /* keyingset to use (dynamic enum) */ prop = RNA_def_enum(ot->srna, "name", DummyRNA_NULL_items, 0, "Object Name", ""); RNA_def_enum_funcs(prop, object_select_menu_enum_itemf); - RNA_def_property_flag(prop, PROP_HIDDEN); + RNA_def_property_flag(prop, PROP_HIDDEN | PROP_ENUM_NO_TRANSLATE); ot->prop = prop; RNA_def_boolean(ot->srna, "toggle", 0, "Toggle", "Toggle selection instead of deselecting everything first"); |