diff options
Diffstat (limited to 'source/blender/editors')
28 files changed, 442 insertions, 450 deletions
diff --git a/source/blender/editors/animation/anim_channels.c b/source/blender/editors/animation/anim_channels.c index 9e0e50a8de5..c52ade1bba8 100644 --- a/source/blender/editors/animation/anim_channels.c +++ b/source/blender/editors/animation/anim_channels.c @@ -721,17 +721,17 @@ enum { /* defines for setting animation-channel flags */ EnumPropertyItem prop_animchannel_setflag_types[] = { - {ACHANNEL_SETFLAG_CLEAR, "DISABLE", "Disable", ""}, - {ACHANNEL_SETFLAG_ADD, "ENABLE", "Enable", ""}, - {ACHANNEL_SETFLAG_TOGGLE, "TOGGLE", "Toggle", ""}, - {0, NULL, NULL, NULL} + {ACHANNEL_SETFLAG_CLEAR, "DISABLE", 0, "Disable", ""}, + {ACHANNEL_SETFLAG_ADD, "ENABLE", 0, "Enable", ""}, + {ACHANNEL_SETFLAG_TOGGLE, "TOGGLE", 0, "Toggle", ""}, + {0, NULL, 0, NULL, NULL} }; /* defines for set animation-channel settings */ EnumPropertyItem prop_animchannel_settings_types[] = { - {ACHANNEL_SETTING_PROTECT, "PROTECT", "Protect", ""}, - {ACHANNEL_SETTING_MUTE, "MUTE", "Mute", ""}, - {0, NULL, NULL, NULL} + {ACHANNEL_SETTING_PROTECT, "PROTECT", 0, "Protect", ""}, + {ACHANNEL_SETTING_MUTE, "MUTE", 0, "Mute", ""}, + {0, NULL, 0, NULL, NULL} }; diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index 0f5cef51bdb..1813c76d0c4 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -106,10 +106,10 @@ void ANIM_OT_keyingset_add_destination (wmOperatorType *ot) { // XXX: this is also defined in rna_animation.c static EnumPropertyItem prop_mode_grouping_items[] = { - {KSP_GROUP_NAMED, "NAMED", "Named Group", ""}, - {KSP_GROUP_NONE, "NONE", "None", ""}, - {KSP_GROUP_KSNAME, "KEYINGSET", "Keying Set Name", ""}, - {0, NULL, NULL, NULL}}; + {KSP_GROUP_NAMED, "NAMED", 0, "Named Group", ""}, + {KSP_GROUP_NONE, "NONE", 0, "None", ""}, + {KSP_GROUP_KSNAME, "KEYINGSET", 0, "Keying Set Name", ""}, + {0, NULL, 0, NULL, NULL}}; /* identifiers */ ot->name= "Add Keying Set Destination"; diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 9c9be51f010..7155bdd6850 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -1957,9 +1957,9 @@ void auto_align_ebone_tocursor(Scene *scene, View3D *v3d, EditBone *ebone) static EnumPropertyItem prop_calc_roll_types[] = { - {0, "GLOBALUP", "Z-Axis Up", ""}, - {1, "CURSOR", "Z-Axis to Cursor", ""}, - {0, NULL, NULL, NULL} + {0, "GLOBALUP", 0, "Z-Axis Up", ""}, + {1, "CURSOR", 0, "Z-Axis to Cursor", ""}, + {0, NULL, 0, NULL, NULL} }; static int armature_calc_roll_exec(bContext *C, wmOperator *op) @@ -3489,9 +3489,9 @@ static int armature_subdivs_exec(bContext *C, wmOperator *op) void ARMATURE_OT_subdivs(wmOperatorType *ot) { static EnumPropertyItem type_items[]= { - {0, "SIMPLE", "Simple", ""}, - {1, "MULTI", "Multi", ""}, - {0, NULL, NULL}}; + {0, "SIMPLE", 0, "Simple", ""}, + {1, "MULTI", 0, "Multi", ""}, + {0, NULL, 0, NULL, NULL}}; /* identifiers */ ot->name= "subdivs"; @@ -3669,9 +3669,9 @@ static void bone_connect_to_new_parent(ListBase *edbo, EditBone *selbone, EditBo } static EnumPropertyItem prop_editarm_make_parent_types[] = { - {ARM_PAR_CONNECT, "CONNECTED", "Connected", ""}, - {ARM_PAR_OFFSET, "OFFSET", "Keep Offset", ""}, - {0, NULL, NULL, NULL} + {ARM_PAR_CONNECT, "CONNECTED", 0, "Connected", ""}, + {ARM_PAR_OFFSET, "OFFSET", 0, "Keep Offset", ""}, + {0, NULL, 0, NULL, NULL} }; static int armature_parent_set_exec(bContext *C, wmOperator *op) @@ -3785,9 +3785,9 @@ void ARMATURE_OT_parent_set(wmOperatorType *ot) } static EnumPropertyItem prop_editarm_clear_parent_types[] = { - {1, "CLEAR", "Clear Parent", ""}, - {2, "DISCONNECT", "Disconnect Bone", ""}, - {0, NULL, NULL, NULL} + {1, "CLEAR", 0, "Clear Parent", ""}, + {2, "DISCONNECT", 0, "Disconnect Bone", ""}, + {0, NULL, 0, NULL, NULL} }; static void editbone_clear_parent(EditBone *ebone, int mode) @@ -3973,9 +3973,9 @@ static int armature_select_hierarchy_exec(bContext *C, wmOperator *op) void ARMATURE_OT_select_hierarchy(wmOperatorType *ot) { static EnumPropertyItem direction_items[]= { - {BONE_SELECT_PARENT, "PARENT", "Select Parent", ""}, - {BONE_SELECT_CHILD, "CHILD", "Select Child", ""}, - {0, NULL, NULL, NULL} + {BONE_SELECT_PARENT, "PARENT", 0, "Select Parent", ""}, + {BONE_SELECT_CHILD, "CHILD", 0, "Select Child", ""}, + {0, NULL, 0, NULL, NULL} }; /* identifiers */ diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c index 0d7bb3c63cc..281f314a546 100644 --- a/source/blender/editors/armature/poseobject.c +++ b/source/blender/editors/armature/poseobject.c @@ -500,9 +500,9 @@ static int pose_select_hierarchy_exec(bContext *C, wmOperator *op) void POSE_OT_select_hierarchy(wmOperatorType *ot) { static EnumPropertyItem direction_items[]= { - {BONE_SELECT_PARENT, "PARENT", "Select Parent", ""}, - {BONE_SELECT_CHILD, "CHILD", "Select Child", ""}, - {0, NULL, NULL, NULL} + {BONE_SELECT_PARENT, "PARENT", 0, "Select Parent", ""}, + {BONE_SELECT_CHILD, "CHILD", 0, "Select Child", ""}, + {0, NULL, 0, NULL, NULL} }; /* identifiers */ diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 45b9a589bd5..466908c562c 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -2475,12 +2475,12 @@ static int set_spline_type_exec(bContext *C, wmOperator *op) void CURVE_OT_spline_type_set(wmOperatorType *ot) { static EnumPropertyItem type_items[]= { - {CU_POLY, "POLY", "Poly", ""}, - {CU_BEZIER, "BEZIER", "Bezier", ""}, - {CU_CARDINAL, "CARDINAL", "Cardinal", ""}, - {CU_BSPLINE, "B_SPLINE", "B-Spline", ""}, - {CU_NURBS, "NURBS", "NURBS", ""}, - {0, NULL, NULL, NULL}}; + {CU_POLY, "POLY", 0, "Poly", ""}, + {CU_BEZIER, "BEZIER", 0, "Bezier", ""}, + {CU_CARDINAL, "CARDINAL", 0, "Cardinal", ""}, + {CU_BSPLINE, "B_SPLINE", 0, "B-Spline", ""}, + {CU_NURBS, "NURBS", 0, "NURBS", ""}, + {0, NULL, 0, NULL, NULL}}; /* identifiers */ ot->name= "Set Spline Type"; @@ -2516,12 +2516,12 @@ static int set_handle_type_exec(bContext *C, wmOperator *op) void CURVE_OT_handle_type_set(wmOperatorType *ot) { static EnumPropertyItem type_items[]= { - {1, "AUTOMATIC", "Automatic", ""}, - {2, "VECTOR", "Vector", ""}, - {3, "TOGGLE_FREE_ALIGN", "Toggle Free/Align", ""}, - {5, "ALIGN", "Align", ""}, - {6, "FREE_ALIGN", "Free Align", ""}, - {0, NULL, NULL, NULL}}; + {1, "AUTOMATIC", 0, "Automatic", ""}, + {2, "VECTOR", 0, "Vector", ""}, + {3, "TOGGLE_FREE_ALIGN", 0, "Toggle Free/Align", ""}, + {5, "ALIGN", 0, "Align", ""}, + {6, "FREE_ALIGN", 0, "Free Align", ""}, + {0, NULL, 0, NULL, NULL}}; /* identifiers */ ot->name= "Set Handle Type"; @@ -3582,9 +3582,9 @@ static int toggle_cyclic_invoke(bContext *C, wmOperator *op, wmEvent *event) void CURVE_OT_cyclic_toggle(wmOperatorType *ot) { static EnumPropertyItem direction_items[]= { - {0, "CYCLIC_U", "Cyclic U", ""}, - {1, "CYCLIC_V", "Cyclic V", ""}, - {0, NULL, NULL, NULL}}; + {0, "CYCLIC_U", 0, "Cyclic U", ""}, + {1, "CYCLIC_V", 0, "Cyclic V", ""}, + {0, NULL, 0, NULL, NULL}}; /* identifiers */ ot->name= "Toggle Cyclic"; @@ -4530,10 +4530,10 @@ static int delete_invoke(bContext *C, wmOperator *op, wmEvent *event) void CURVE_OT_delete(wmOperatorType *ot) { static EnumPropertyItem type_items[] = { - {0, "SELECTED", "Selected", ""}, - {1, "SEGMENT", "Segment", ""}, - {2, "ALL", "All", ""}, - {0, NULL, NULL, NULL}}; + {0, "SELECTED", 0, "Selected", ""}, + {1, "SEGMENT", 0, "Segment", ""}, + {2, "ALL", 0, "All", ""}, + {0, NULL, 0, NULL, NULL}}; /* identifiers */ ot->name= "Delete"; diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index 0fb6fb8cb90..5389db9e2ee 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -607,10 +607,10 @@ static int kill_selection(Object *obedit, int ins) /* 1 == new character */ /******************* set style operator ********************/ static EnumPropertyItem style_items[]= { - {CU_BOLD, "BOLD", "Bold", ""}, - {CU_ITALIC, "ITALIC", "Italic", ""}, - {CU_UNDERLINE, "UNDERLINE", "Underline", ""}, - {0, NULL, NULL, NULL}}; + {CU_BOLD, "BOLD", 0, "Bold", ""}, + {CU_ITALIC, "ITALIC", 0, "Italic", ""}, + {CU_UNDERLINE, "UNDERLINE", 0, "Underline", ""}, + {0, NULL, 0, NULL, NULL}}; static int set_style(bContext *C, int style, int clear) { @@ -873,17 +873,17 @@ void FONT_OT_text_paste(wmOperatorType *ot) /************************ move operator ************************/ static EnumPropertyItem move_type_items[]= { - {LINE_BEGIN, "LINE_BEGIN", "Line Begin", ""}, - {LINE_END, "LINE_END", "Line End", ""}, - {PREV_CHAR, "PREVIOUS_CHARACTER", "Previous Character", ""}, - {NEXT_CHAR, "NEXT_CHARACTER", "Next Character", ""}, - {PREV_WORD, "PREVIOUS_WORD", "Previous Word", ""}, - {NEXT_WORD, "NEXT_WORD", "Next Word", ""}, - {PREV_LINE, "PREVIOUS_LINE", "Previous Line", ""}, - {NEXT_LINE, "NEXT_LINE", "Next Line", ""}, - {PREV_PAGE, "PREVIOUS_PAGE", "Previous Page", ""}, - {NEXT_PAGE, "NEXT_PAGE", "Next Page", ""}, - {0, NULL, NULL, NULL}}; + {LINE_BEGIN, "LINE_BEGIN", 0, "Line Begin", ""}, + {LINE_END, "LINE_END", 0, "Line End", ""}, + {PREV_CHAR, "PREVIOUS_CHARACTER", 0, "Previous Character", ""}, + {NEXT_CHAR, "NEXT_CHARACTER", 0, "Next Character", ""}, + {PREV_WORD, "PREVIOUS_WORD", 0, "Previous Word", ""}, + {NEXT_WORD, "NEXT_WORD", 0, "Next Word", ""}, + {PREV_LINE, "PREVIOUS_LINE", 0, "Previous Line", ""}, + {NEXT_LINE, "NEXT_LINE", 0, "Next Line", ""}, + {PREV_PAGE, "PREVIOUS_PAGE", 0, "Previous Page", ""}, + {NEXT_PAGE, "NEXT_PAGE", 0, "Next Page", ""}, + {0, NULL, 0, NULL, NULL}}; static int move_cursor(bContext *C, int type, int select) { @@ -1164,13 +1164,13 @@ void FONT_OT_line_break(wmOperatorType *ot) /******************* delete operator **********************/ static EnumPropertyItem delete_type_items[]= { - {DEL_ALL, "ALL", "All", ""}, - {DEL_NEXT_CHAR, "NEXT_CHARACTER", "Next Character", ""}, - {DEL_PREV_CHAR, "PREVIOUS_CHARACTER", "Previous Character", ""}, - {DEL_SELECTION, "SELECTION", "Selection", ""}, - {DEL_NEXT_SEL, "NEXT_OR_SELECTION", "Next or Selection", ""}, - {DEL_PREV_SEL, "PREVIOUS_OR_SELECTION", "Previous or Selection", ""}, - {0, NULL, NULL, NULL}}; + {DEL_ALL, "ALL", 0, "All", ""}, + {DEL_NEXT_CHAR, "NEXT_CHARACTER", 0, "Next Character", ""}, + {DEL_PREV_CHAR, "PREVIOUS_CHARACTER", 0, "Previous Character", ""}, + {DEL_SELECTION, "SELECTION", 0, "Selection", ""}, + {DEL_NEXT_SEL, "NEXT_OR_SELECTION", 0, "Next or Selection", ""}, + {DEL_PREV_SEL, "PREVIOUS_OR_SELECTION", 0, "Previous or Selection", ""}, + {0, NULL, 0, NULL, NULL}}; static int delete_exec(bContext *C, wmOperator *op) { @@ -1465,9 +1465,9 @@ void free_editText(Object *obedit) /********************** set case operator *********************/ static EnumPropertyItem case_items[]= { - {CASE_LOWER, "LOWER", "Lower", ""}, - {CASE_UPPER, "UPPER", "Upper", ""}, - {0, NULL, NULL, NULL}}; + {CASE_LOWER, "LOWER", 0, "Lower", ""}, + {CASE_UPPER, "UPPER", 0, "Upper", ""}, + {0, NULL, 0, NULL, NULL}}; static int set_case(bContext *C, int ccase) { diff --git a/source/blender/editors/interface/interface_api.c b/source/blender/editors/interface/interface_api.c index 7b2cdbe32dd..31b0b85fae6 100644 --- a/source/blender/editors/interface/interface_api.c +++ b/source/blender/editors/interface/interface_api.c @@ -35,10 +35,10 @@ #include "UI_interface.h" #include "UI_resources.h" -#define DEF_ICON(name) {name, #name, #name, ""}, +#define DEF_ICON(name) {name, #name, 0, #name, ""}, static EnumPropertyItem icon_items[] = { #include "UI_icons.h" - {0, NULL, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}}; #undef DEF_ICON static void api_ui_item_common(FunctionRNA *func) @@ -62,16 +62,26 @@ static void api_ui_item_op_common(FunctionRNA *func) RNA_def_property_flag(parm, PROP_REQUIRED); } +static void api_ui_item_rna_common(FunctionRNA *func) +{ + PropertyRNA *parm; + + parm= RNA_def_pointer(func, "data", "AnyType", "", "Data from which to take property."); + RNA_def_property_flag(parm, PROP_REQUIRED|PROP_RNAPTR); + parm= RNA_def_string(func, "property", "", 0, "", "Identifier of property in data."); + RNA_def_property_flag(parm, PROP_REQUIRED); +} + void RNA_api_ui_layout(StructRNA *srna) { FunctionRNA *func; PropertyRNA *parm; static EnumPropertyItem curve_type_items[] = { - {0, "NONE", "None", ""}, - {'v', "VECTOR", "Vector", ""}, - {'c', "COLOR", "Color", ""}, - {0, NULL, NULL, NULL}}; + {0, "NONE", 0, "None", ""}, + {'v', "VECTOR", 0, "Vector", ""}, + {'c', "COLOR", 0, "Color", ""}, + {0, NULL, 0, NULL, NULL}}; /* simple layout specifiers */ func= RNA_def_function(srna, "row", "uiLayoutRow"); @@ -104,33 +114,21 @@ void RNA_api_ui_layout(StructRNA *srna) /* items */ func= RNA_def_function(srna, "itemR", "uiItemR"); api_ui_item_common(func); - parm= RNA_def_pointer(func, "data", "AnyType", "", "Data from which to take property."); - RNA_def_property_flag(parm, PROP_REQUIRED); - parm= RNA_def_string(func, "property", "", 0, "", "Identifier of property in data."); - RNA_def_property_flag(parm, PROP_REQUIRED); + api_ui_item_rna_common(func); RNA_def_boolean(func, "expand", 0, "", "Expand button to show more detail."); RNA_def_boolean(func, "slider", 0, "", "Use slider widget for numeric values."); RNA_def_boolean(func, "toggle", 0, "", "Use toggle widget for boolean values."); func= RNA_def_function(srna, "items_enumR", "uiItemsEnumR"); - parm= RNA_def_pointer(func, "data", "AnyType", "", "Data from which to take property."); - RNA_def_property_flag(parm, PROP_REQUIRED); - parm= RNA_def_string(func, "property", "", 0, "", "Identifier of property in data."); - RNA_def_property_flag(parm, PROP_REQUIRED); + api_ui_item_rna_common(func); func= RNA_def_function(srna, "item_menu_enumR", "uiItemMenuEnumR"); api_ui_item_common(func); - parm= RNA_def_pointer(func, "data", "AnyType", "", "Data from which to take property."); - RNA_def_property_flag(parm, PROP_REQUIRED); - parm= RNA_def_string(func, "property", "", 0, "", "Identifier of property in data."); - RNA_def_property_flag(parm, PROP_REQUIRED); + api_ui_item_rna_common(func); /*func= RNA_def_function(srna, "item_enumR", "uiItemEnumR"); api_ui_item_common(func); - parm= RNA_def_pointer(func, "data", "AnyType", "", "Data from which to take property."); - RNA_def_property_flag(parm, PROP_REQUIRED); - parm= RNA_def_string(func, "property", "", 0, "", "Identifier of property in data."); - RNA_def_property_flag(parm, PROP_REQUIRED); + api_ui_item_rna_common(func); parm= RNA_def_string(func, "value", "", 0, "", "Enum property value."); RNA_def_property_flag(parm, PROP_REQUIRED);*/ @@ -200,7 +198,7 @@ void RNA_api_ui_layout(StructRNA *srna) parm= RNA_def_string(func, "name", "", 0, "Name", "Name of entry in the context."); RNA_def_property_flag(parm, PROP_REQUIRED); parm= RNA_def_pointer(func, "data", "AnyType", "", "Pointer to put in context."); - RNA_def_property_flag(parm, PROP_REQUIRED); + RNA_def_property_flag(parm, PROP_REQUIRED|PROP_RNAPTR); /* templates */ func= RNA_def_function(srna, "template_header", "uiTemplateHeader"); @@ -210,23 +208,20 @@ void RNA_api_ui_layout(StructRNA *srna) func= RNA_def_function(srna, "template_ID", "uiTemplateID"); parm= RNA_def_pointer(func, "context", "Context", "", "Current context."); RNA_def_property_flag(parm, PROP_REQUIRED); - parm= RNA_def_pointer(func, "data", "AnyType", "", "Data from which to take property."); - RNA_def_property_flag(parm, PROP_REQUIRED); - parm= RNA_def_string(func, "property", "", 0, "", "Identifier of pointer property in data."); - RNA_def_property_flag(parm, PROP_REQUIRED); + api_ui_item_rna_common(func); RNA_def_string(func, "new", "", 0, "", "Operator identifier to create a new ID block."); RNA_def_string(func, "open", "", 0, "", "Operator identifier to open a new ID block."); RNA_def_string(func, "unlink", "", 0, "", "Operator identifier to unlink the ID block."); func= RNA_def_function(srna, "template_modifier", "uiTemplateModifier"); - parm= RNA_def_pointer(func, "data", "AnyType", "", "Modifier data."); - RNA_def_property_flag(parm, PROP_REQUIRED); + parm= RNA_def_pointer(func, "data", "Modifier", "", "Modifier data."); + RNA_def_property_flag(parm, PROP_REQUIRED|PROP_RNAPTR); parm= RNA_def_pointer(func, "layout", "UILayout", "", "Sub-layout to put items in."); RNA_def_function_return(func, parm); func= RNA_def_function(srna, "template_constraint", "uiTemplateConstraint"); - parm= RNA_def_pointer(func, "data", "AnyType", "", "Constraint data."); - RNA_def_property_flag(parm, PROP_REQUIRED); + parm= RNA_def_pointer(func, "data", "Constraint", "", "Constraint data."); + RNA_def_property_flag(parm, PROP_REQUIRED|PROP_RNAPTR); parm= RNA_def_pointer(func, "layout", "UILayout", "", "Sub-layout to put items in."); RNA_def_function_return(func, parm); @@ -245,9 +240,6 @@ void RNA_api_ui_layout(StructRNA *srna) RNA_def_boolean(func, "expand", 0, "", "Expand button to show more detail."); func= RNA_def_function(srna, "template_layers", "uiTemplateLayers"); - parm= RNA_def_pointer(func, "data", "AnyType", "", "Data from which to take property."); - RNA_def_property_flag(parm, PROP_REQUIRED); - parm= RNA_def_string(func, "property", "", 0, "", "Identifier of pointer property in data."); - RNA_def_property_flag(parm, PROP_REQUIRED); + api_ui_item_rna_common(func); } diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c index 40373c9f327..dd003d103d5 100644 --- a/source/blender/editors/mesh/editmesh.c +++ b/source/blender/editors/mesh/editmesh.c @@ -1434,10 +1434,10 @@ void remake_editMesh(Scene *scene, Object *ob) /* *************** Operator: separate parts *************/ static EnumPropertyItem prop_separate_types[] = { - {0, "SELECTED", "Selection", ""}, - {1, "MATERIAL", "By Material", ""}, - {2, "LOOSE", "By loose parts", ""}, - {0, NULL, NULL, NULL} + {0, "SELECTED", 0, "Selection", ""}, + {1, "MATERIAL", 0, "By Material", ""}, + {2, "LOOSE", 0, "By loose parts", ""}, + {0, NULL, 0, NULL, NULL} }; /* return 1: success */ diff --git a/source/blender/editors/mesh/editmesh_loop.c b/source/blender/editors/mesh/editmesh_loop.c index d0f7517df78..afbf43c4d85 100644 --- a/source/blender/editors/mesh/editmesh_loop.c +++ b/source/blender/editors/mesh/editmesh_loop.c @@ -458,10 +458,10 @@ typedef struct CutCurve { #define KNIFE_MULTICUT 3 static EnumPropertyItem knife_items[]= { - {KNIFE_EXACT, "EXACT", "Exact", ""}, - {KNIFE_MIDPOINT, "MIDPOINTS", "Midpoints", ""}, - {KNIFE_MULTICUT, "MULTICUT", "Multicut", ""}, - {0, NULL, NULL} + {KNIFE_EXACT, "EXACT", 0, "Exact", ""}, + {KNIFE_MIDPOINT, "MIDPOINTS", 0, "Midpoints", ""}, + {KNIFE_MULTICUT, "MULTICUT", 0, "Multicut", ""}, + {0, NULL, 0, NULL, NULL} }; /* seg_intersect() Determines if and where a mouse trail intersects an EditEdge */ diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c index faa3176c958..a1f8b3251c8 100644 --- a/source/blender/editors/mesh/editmesh_mods.c +++ b/source/blender/editors/mesh/editmesh_mods.c @@ -655,13 +655,13 @@ FACES GROUP */ static EnumPropertyItem prop_simface_types[] = { - {1, "MATERIAL", "Material", ""}, - {2, "IMAGE", "Image", ""}, - {3, "AREA", "Area", ""}, - {4, "PERIMETER", "Perimeter", ""}, - {5, "NORMAL", "Normal", ""}, - {6, "COPLANAR", "Co-planar", ""}, - {0, NULL, NULL, NULL} + {1, "MATERIAL", 0, "Material", ""}, + {2, "IMAGE", 0, "Image", ""}, + {3, "AREA", 0, "Area", ""}, + {4, "PERIMETER", 0, "Perimeter", ""}, + {5, "NORMAL", 0, "Normal", ""}, + {6, "COPLANAR", 0, "Co-planar", ""}, + {0, NULL, 0, NULL, NULL} }; @@ -849,14 +849,14 @@ EDGE GROUP */ static EnumPropertyItem prop_simedge_types[] = { - {1, "LENGTH", "Length", ""}, - {2, "DIR", "Direction", ""}, - {3, "FACE", "Amount of Vertices in Face", ""}, - {4, "FACE_ANGLE", "Face Angles", ""}, - {5, "CREASE", "Crease", ""}, - {6, "SEAM", "Seam", ""}, - {7, "SHARP", "Sharpness", ""}, - {0, NULL, NULL, NULL} + {1, "LENGTH", 0, "Length", ""}, + {2, "DIR", 0, "Direction", ""}, + {3, "FACE", 0, "Amount of Vertices in Face", ""}, + {4, "FACE_ANGLE", 0, "Face Angles", ""}, + {5, "CREASE", 0, "Crease", ""}, + {6, "SEAM", 0, "Seam", ""}, + {7, "SHARP", 0, "Sharpness", ""}, + {0, NULL, 0, NULL, NULL} }; static int similar_edge_select__internal(Scene *scene, EditMesh *em, int mode) @@ -1105,10 +1105,10 @@ VERT GROUP mode 3: same vertex groups */ static EnumPropertyItem prop_simvertex_types[] = { - {0, "NORMAL", "Normal", ""}, - {1, "FACE", "Amount of Vertices in Face", ""}, - {2, "VGROUP", "Vertex Groups", ""}, - {0, NULL, NULL, NULL} + {0, "NORMAL", 0, "Normal", ""}, + {1, "FACE", 0, "Amount of Vertices in Face", ""}, + {2, "VGROUP", 0, "Vertex Groups", ""}, + {0, NULL, 0, NULL, NULL} }; @@ -3537,10 +3537,10 @@ static void mesh_selection_type(Scene *scene, EditMesh *em, int val) } static EnumPropertyItem prop_mesh_edit_types[] = { - {1, "VERT", "Vertices", ""}, - {2, "EDGE", "Edges", ""}, - {3, "FACE", "Faces", ""}, - {0, NULL, NULL, NULL} + {1, "VERT", 0, "Vertices", ""}, + {2, "EDGE", 0, "Edges", ""}, + {3, "FACE", 0, "Faces", ""}, + {0, NULL, 0, NULL, NULL} }; static int mesh_selection_type_exec(bContext *C, wmOperator *op) diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 4fc16297db8..45cf67de17e 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -1273,14 +1273,14 @@ void delete_mesh(Object *obedit, EditMesh *em, wmOperator *op, int event) /* Note, these values must match delete_mesh() event values */ static EnumPropertyItem prop_mesh_delete_types[] = { - {10,"VERT", "Vertices", ""}, - {1, "EDGE", "Edges", ""}, - {2, "FACE", "Faces", ""}, - {3, "ALL", "All", ""}, - {4, "EDGE_FACE","Edges & Faces", ""}, - {5, "ONLY_FACE","Only Faces", ""}, - {6, "EDGE_LOOP","Edge Loop", ""}, - {0, NULL, NULL, NULL} + {10,"VERT", 0, "Vertices", ""}, + {1, "EDGE", 0, "Edges", ""}, + {2, "FACE", 0, "Faces", ""}, + {3, "ALL", 0, "All", ""}, + {4, "EDGE_FACE",0, "Edges & Faces", ""}, + {5, "ONLY_FACE",0, "Only Faces", ""}, + {6, "EDGE_LOOP",0, "Edge Loop", ""}, + {0, NULL, 0, NULL, NULL} }; static int delete_mesh_exec(bContext *C, wmOperator *op) @@ -6646,11 +6646,11 @@ static int subdivs_exec(bContext *C, wmOperator *op) void MESH_OT_subdivs(wmOperatorType *ot) { static EnumPropertyItem type_items[]= { - {0, "SIMPLE", "Simple", ""}, - {1, "MULTI", "Multi", ""}, - {2, "FRACTAL", "Fractal", ""}, - {3, "SMOOTH", "Smooth", ""}, - {0, NULL, NULL}}; + {0, "SIMPLE", 0, "Simple", ""}, + {1, "MULTI", 0, "Multi", ""}, + {2, "FRACTAL", 0, "Fractal", ""}, + {3, "SMOOTH", 0, "Smooth", ""}, + {0, NULL, 0, NULL, NULL}}; /* identifiers */ ot->name= "subdivs"; diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 4cf98f2c904..74a1fc12631 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -244,17 +244,17 @@ void ED_object_base_init_from_view(bContext *C, Base *base) /* ******************* add object operator ****************** */ static EnumPropertyItem prop_object_types[] = { - {OB_EMPTY, "EMPTY", "Empty", ""}, - {OB_MESH, "MESH", "Mesh", ""}, - {OB_CURVE, "CURVE", "Curve", ""}, - {OB_SURF, "SURFACE", "Surface", ""}, - {OB_FONT, "TEXT", "Text", ""}, - {OB_MBALL, "META", "Meta", ""}, - {OB_LAMP, "LAMP", "Lamp", ""}, - {OB_CAMERA, "CAMERA", "Camera", ""}, - {OB_ARMATURE, "ARMATURE", "Armature", ""}, - {OB_LATTICE, "LATTICE", "Lattice", ""}, - {0, NULL, NULL, NULL} + {OB_EMPTY, "EMPTY", 0, "Empty", ""}, + {OB_MESH, "MESH", 0, "Mesh", ""}, + {OB_CURVE, "CURVE", 0, "Curve", ""}, + {OB_SURF, "SURFACE", 0, "Surface", ""}, + {OB_FONT, "TEXT", 0, "Text", ""}, + {OB_MBALL, "META", 0, "Meta", ""}, + {OB_LAMP, "LAMP", 0, "Lamp", ""}, + {OB_CAMERA, "CAMERA", 0, "Camera", ""}, + {OB_ARMATURE, "ARMATURE", 0, "Armature", ""}, + {OB_LATTICE, "LATTICE", 0, "Lattice", ""}, + {0, NULL, 0, NULL, NULL} }; @@ -321,16 +321,16 @@ void OBJECT_OT_object_add(wmOperatorType *ot) /* ****** work both in and outside editmode ****** */ static EnumPropertyItem prop_mesh_types[] = { - {0, "PLANE", "Plane", ""}, - {1, "CUBE", "Cube", ""}, - {2, "CIRCLE", "Circle", ""}, - {3, "UVSPHERE", "UVsphere", ""}, - {4, "ICOSPHERE", "Icosphere", ""}, - {5, "CYLINDER", "Cylinder", ""}, - {6, "CONE", "Cone", ""}, - {7, "GRID", "Grid", ""}, - {8, "MONKEY", "Monkey", ""}, - {0, NULL, NULL, NULL} + {0, "PLANE", 0, "Plane", ""}, + {1, "CUBE", 0, "Cube", ""}, + {2, "CIRCLE", 0, "Circle", ""}, + {3, "UVSPHERE", 0, "UVsphere", ""}, + {4, "ICOSPHERE", 0, "Icosphere", ""}, + {5, "CYLINDER", 0, "Cylinder", ""}, + {6, "CONE", 0, "Cone", ""}, + {7, "GRID", 0, "Grid", ""}, + {8, "MONKEY", 0, "Monkey", ""}, + {0, NULL, 0, NULL, NULL} }; static int object_add_mesh_exec(bContext *C, wmOperator *op) @@ -405,12 +405,12 @@ void OBJECT_OT_mesh_add(wmOperatorType *ot) } static EnumPropertyItem prop_curve_types[] = { - {CU_BEZIER|CU_2D|CU_PRIM_CURVE, "BEZIER_CURVE", "Bezier Curve", ""}, - {CU_BEZIER|CU_2D|CU_PRIM_CIRCLE, "BEZIER_CIRCLE", "Bezier Circle", ""}, - {CU_NURBS|CU_2D|CU_PRIM_CURVE, "NURBS_CURVE", "NURBS Curve", ""}, - {CU_NURBS|CU_2D|CU_PRIM_CIRCLE, "NURBS_CIRCLE", "NURBS Circle", ""}, - {CU_NURBS|CU_2D|CU_PRIM_PATH, "PATH", "Path", ""}, - {0, NULL, NULL, NULL} + {CU_BEZIER|CU_2D|CU_PRIM_CURVE, "BEZIER_CURVE", 0, "Bezier Curve", ""}, + {CU_BEZIER|CU_2D|CU_PRIM_CIRCLE, "BEZIER_CIRCLE", 0, "Bezier Circle", ""}, + {CU_NURBS|CU_2D|CU_PRIM_CURVE, "NURBS_CURVE", 0, "NURBS Curve", ""}, + {CU_NURBS|CU_2D|CU_PRIM_CIRCLE, "NURBS_CIRCLE", 0, "NURBS Circle", ""}, + {CU_NURBS|CU_2D|CU_PRIM_PATH, "PATH", 0, "Path", ""}, + {0, NULL, 0, NULL, NULL} }; static int object_add_curve_exec(bContext *C, wmOperator *op) @@ -479,13 +479,13 @@ void OBJECT_OT_curve_add(wmOperatorType *ot) } static EnumPropertyItem prop_surface_types[]= { - {CU_PRIM_CURVE|CU_NURBS, "NURBS_CURVE", "NURBS Curve", ""}, - {CU_PRIM_CIRCLE|CU_NURBS, "NURBS_CIRCLE", "NURBS Circle", ""}, - {CU_PRIM_PATCH|CU_NURBS, "NURBS_SURFACE", "NURBS Surface", ""}, - {CU_PRIM_TUBE|CU_NURBS, "NURBS_TUBE", "NURBS Tube", ""}, - {CU_PRIM_SPHERE|CU_NURBS, "NURBS_SPHERE", "NURBS Sphere", ""}, - {CU_PRIM_DONUT|CU_NURBS, "NURBS_DONUT", "NURBS Donut", ""}, - {0, NULL, NULL, NULL} + {CU_PRIM_CURVE|CU_NURBS, "NURBS_CURVE", 0, "NURBS Curve", ""}, + {CU_PRIM_CIRCLE|CU_NURBS, "NURBS_CIRCLE", 0, "NURBS Circle", ""}, + {CU_PRIM_PATCH|CU_NURBS, "NURBS_SURFACE", 0, "NURBS Surface", ""}, + {CU_PRIM_TUBE|CU_NURBS, "NURBS_TUBE", 0, "NURBS Tube", ""}, + {CU_PRIM_SPHERE|CU_NURBS, "NURBS_SPHERE", 0, "NURBS Sphere", ""}, + {CU_PRIM_DONUT|CU_NURBS, "NURBS_DONUT", 0, "NURBS Donut", ""}, + {0, NULL, 0, NULL, NULL} }; static int object_add_surface_exec(bContext *C, wmOperator *op) @@ -1366,10 +1366,10 @@ void add_hook_menu(Scene *scene, View3D *v3d) /* ******************** clear parent operator ******************* */ static EnumPropertyItem prop_clear_parent_types[] = { - {0, "CLEAR", "Clear Parent", ""}, - {1, "CLEAR_KEEP_TRANSFORM", "Clear and Keep Transformation (Clear Track)", ""}, - {2, "CLEAR_INVERSE", "Clear Parent Inverse", ""}, - {0, NULL, NULL, NULL} + {0, "CLEAR", 0, "Clear Parent", ""}, + {1, "CLEAR_KEEP_TRANSFORM", 0, "Clear and Keep Transformation (Clear Track)", ""}, + {2, "CLEAR_INVERSE", 0, "Clear Parent Inverse", ""}, + {0, NULL, 0, NULL, NULL} }; /* note, poll should check for editable scene */ @@ -1422,9 +1422,9 @@ void OBJECT_OT_parent_clear(wmOperatorType *ot) static EnumPropertyItem prop_clear_track_types[] = { - {0, "CLEAR", "Clear Track", ""}, - {1, "CLEAR_KEEP_TRANSFORM", "Clear and Keep Transformation (Clear Track)", ""}, - {0, NULL, NULL, NULL} + {0, "CLEAR", 0, "Clear Track", ""}, + {1, "CLEAR_KEEP_TRANSFORM", 0, "Clear and Keep Transformation (Clear Track)", ""}, + {0, NULL, 0, NULL, NULL} }; /* note, poll should check for editable scene */ @@ -1471,9 +1471,9 @@ void OBJECT_OT_track_clear(wmOperatorType *ot) /* *****************Selection Operators******************* */ static EnumPropertyItem prop_select_types[] = { - {0, "EXCLUSIVE", "Exclusive", ""}, - {1, "EXTEND", "Extend", ""}, - {0, NULL, NULL, NULL} + {0, "EXCLUSIVE", 0, "Exclusive", ""}, + {1, "EXTEND", 0, "Extend", ""}, + {0, NULL, 0, NULL, NULL} }; /* ****** Select by Type ****** */ @@ -1526,13 +1526,13 @@ void OBJECT_OT_select_by_type(wmOperatorType *ot) /* ****** selection by links *******/ static EnumPropertyItem prop_select_linked_types[] = { - {1, "IPO", "Object IPO", ""}, // XXX depreceated animation system stuff... - {2, "OBDATA", "Ob Data", ""}, - {3, "MATERIAL", "Material", ""}, - {4, "TEXTURE", "Texture", ""}, - {5, "DUPGROUP", "Dupligroup", ""}, - {6, "PARTICLE", "Particle System", ""}, - {0, NULL, NULL, NULL} + {1, "IPO", 0, "Object IPO", ""}, // XXX depreceated animation system stuff... + {2, "OBDATA", 0, "Ob Data", ""}, + {3, "MATERIAL", 0, "Material", ""}, + {4, "TEXTURE", 0, "Texture", ""}, + {5, "DUPGROUP", 0, "Dupligroup", ""}, + {6, "PARTICLE", 0, "Particle System", ""}, + {0, NULL, 0, NULL, NULL} }; static int object_select_linked_exec(bContext *C, wmOperator *op) @@ -2085,9 +2085,9 @@ void OBJECT_OT_restrictview_clear(wmOperatorType *ot) } static EnumPropertyItem prop_set_restrictview_types[] = { - {0, "SELECTED", "Selected", ""}, - {1, "UNSELECTED", "Unselected ", ""}, - {0, NULL, NULL, NULL} + {0, "SELECTED", 0, "Selected", ""}, + {1, "UNSELECTED", 0, "Unselected ", ""}, + {0, NULL, 0, NULL, NULL} }; static int object_restrictview_set_exec(bContext *C, wmOperator *op) @@ -2462,16 +2462,16 @@ void make_proxy(Scene *scene) #define PAR_TRIA 8 static EnumPropertyItem prop_make_parent_types[] = { - {PAR_OBJECT, "OBJECT", "Object", ""}, - {PAR_ARMATURE, "ARMATURE", "Armature Deform", ""}, - {PAR_BONE, "BONE", "Bone", ""}, - {PAR_CURVE, "CURVE", "Curve Deform", ""}, - {PAR_FOLLOW, "FOLLOW", "Follow Path", ""}, - {PAR_PATH_CONST, "PATH_CONST", "Path Constraint", ""}, - {PAR_LATTICE, "LATTICE", "Lattice Deform", ""}, - {PAR_VERTEX, "VERTEX", "Vertex", ""}, - {PAR_TRIA, "TRIA", "Triangle", ""}, - {0, NULL, NULL, NULL} + {PAR_OBJECT, "OBJECT", 0, "Object", ""}, + {PAR_ARMATURE, "ARMATURE", 0, "Armature Deform", ""}, + {PAR_BONE, "BONE", 0, "Bone", ""}, + {PAR_CURVE, "CURVE", 0, "Curve Deform", ""}, + {PAR_FOLLOW, "FOLLOW", 0, "Follow Path", ""}, + {PAR_PATH_CONST, "PATH_CONST", 0, "Path Constraint", ""}, + {PAR_LATTICE, "LATTICE", 0, "Lattice Deform", ""}, + {PAR_VERTEX, "VERTEX", 0, "Vertex", ""}, + {PAR_TRIA, "TRIA", 0, "Triangle", ""}, + {0, NULL, 0, NULL, NULL} }; static int test_parent_loop(Object *par, Object *ob) @@ -2655,10 +2655,10 @@ void OBJECT_OT_parent_set(wmOperatorType *ot) /* *** make track ***** */ static EnumPropertyItem prop_make_track_types[] = { - {1, "TRACKTO", "TrackTo Constraint", ""}, - {2, "LOCKTRACK", "LockTrack Constraint", ""}, - {3, "OLDTRACK", "Old Track", ""}, - {0, NULL, NULL, NULL} + {1, "TRACKTO", 0, "TrackTo Constraint", ""}, + {2, "LOCKTRACK", 0, "LockTrack Constraint", ""}, + {3, "OLDTRACK", 0, "Old Track", ""}, + {0, NULL, 0, NULL, NULL} }; static int track_set_exec(bContext *C, wmOperator *op) @@ -2831,10 +2831,10 @@ void OBJECT_OT_dupli_set_real(wmOperatorType *ot) /* ******************* Set Object Center ********************** */ static EnumPropertyItem prop_set_center_types[] = { - {0, "CENTER", "ObData to Center", "Move object data around Object center"}, - {1, "CENTERNEW", "Center New", "Move Object center to center of object data"}, - {2, "CENTERCURSOR", "Center Cursor", "Move Object Center to position of the 3d cursor"}, - {0, NULL, NULL, NULL} + {0, "CENTER", 0, "ObData to Center", "Move object data around Object center"}, + {1, "CENTERNEW", 0, "Center New", "Move Object center to center of object data"}, + {2, "CENTERCURSOR", 0, "Center Cursor", "Move Object Center to position of the 3d cursor"}, + {0, NULL, 0, NULL, NULL} }; /* 0 == do center, 1 == center new, 2 == center cursor */ diff --git a/source/blender/editors/physics/editparticle.c b/source/blender/editors/physics/editparticle.c index 0947f540fc6..a9fc65bdc37 100644 --- a/source/blender/editors/physics/editparticle.c +++ b/source/blender/editors/physics/editparticle.c @@ -2347,8 +2347,8 @@ void PARTICLE_OT_brush_radial_control(wmOperatorType *ot) enum { DEL_PARTICLE, DEL_KEY }; static EnumPropertyItem delete_type_items[]= { - {DEL_PARTICLE, "PARTICLE", "Particle", ""}, - {DEL_KEY, "KEY", "Key", ""}, + {DEL_PARTICLE, "PARTICLE", 0, "Particle", ""}, + {DEL_KEY, "KEY", 0, "Key", ""}, {0, NULL, NULL}}; static void set_delete_particle(PEData *data, int pa_index) @@ -2563,15 +2563,15 @@ void PARTICLE_OT_mirror(wmOperatorType *ot) /*********************** set brush operator **********************/ static EnumPropertyItem brush_type_items[]= { - {PE_BRUSH_NONE, "NONE", "None", ""}, - {PE_BRUSH_COMB, "COMB", "Comb", ""}, - {PE_BRUSH_SMOOTH, "SMOOTH", "Smooth", ""}, - {PE_BRUSH_WEIGHT, "WEIGHT", "Weight", ""}, - {PE_BRUSH_ADD, "ADD", "Add", ""}, - {PE_BRUSH_LENGTH, "LENGTH", "Length", ""}, - {PE_BRUSH_PUFF, "PUFF", "Puff", ""}, - {PE_BRUSH_CUT, "CUT", "Cut", ""}, - {0, NULL, NULL, NULL} + {PE_BRUSH_NONE, "NONE", 0, "None", ""}, + {PE_BRUSH_COMB, "COMB", 0, "Comb", ""}, + {PE_BRUSH_SMOOTH, "SMOOTH", 0, "Smooth", ""}, + {PE_BRUSH_WEIGHT, "WEIGHT", 0, "Weight", ""}, + {PE_BRUSH_ADD, "ADD", 0, "Add", ""}, + {PE_BRUSH_LENGTH, "LENGTH", 0, "Length", ""}, + {PE_BRUSH_PUFF, "PUFF", 0, "Puff", ""}, + {PE_BRUSH_CUT, "CUT", 0, "Cut", ""}, + {0, NULL, 0, NULL, NULL} }; static int set_brush_exec(bContext *C, wmOperator *op) diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 3f4d175c94e..dae7a7cedd5 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -1192,9 +1192,9 @@ static int area_split_modal(bContext *C, wmOperator *op, wmEvent *event) } static EnumPropertyItem prop_direction_items[] = { - {'h', "HORIZONTAL", "Horizontal", ""}, - {'v', "VERTICAL", "Vertical", ""}, - {0, NULL, NULL, NULL}}; + {'h', "HORIZONTAL", 0, "Horizontal", ""}, + {'v', "VERTICAL", 0, "Vertical", ""}, + {0, NULL, 0, NULL, NULL}}; void SCREEN_OT_area_split(wmOperatorType *ot) { diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index dc954ff5f26..2dba08b4601 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -1245,10 +1245,10 @@ static int sculpt_brush_curve_preset_exec(bContext *C, wmOperator *op) static void SCULPT_OT_brush_curve_preset(wmOperatorType *ot) { static EnumPropertyItem prop_mode_items[] = { - {BRUSH_PRESET_SHARP, "SHARP", "Sharp Curve", ""}, - {BRUSH_PRESET_SMOOTH, "SMOOTH", "Smooth Curve", ""}, - {BRUSH_PRESET_MAX, "MAX", "Max Curve", ""}, - {0, NULL, NULL, NULL}}; + {BRUSH_PRESET_SHARP, "SHARP", 0, "Sharp Curve", ""}, + {BRUSH_PRESET_SMOOTH, "SMOOTH", 0, "Smooth Curve", ""}, + {BRUSH_PRESET_MAX, "MAX", 0, "Max Curve", ""}, + {0, NULL, 0, NULL, NULL}}; ot->name= "Preset"; ot->idname= "SCULPT_OT_brush_curve_preset"; diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c index af074ca348d..a0f1adbd97e 100644 --- a/source/blender/editors/space_action/action_edit.c +++ b/source/blender/editors/space_action/action_edit.c @@ -369,10 +369,10 @@ void ACT_OT_keyframes_paste (wmOperatorType *ot) /* defines for insert keyframes tool */ EnumPropertyItem prop_actkeys_insertkey_types[] = { - {1, "ALL", "All Channels", ""}, - {2, "SEL", "Only Selected Channels", ""}, - {3, "GROUP", "In Active Group", ""}, // xxx not in all cases - {0, NULL, NULL, NULL} + {1, "ALL", 0, "All Channels", ""}, + {2, "SEL", 0, "Only Selected Channels", ""}, + {3, "GROUP", 0, "In Active Group", ""}, // xxx not in all cases + {0, NULL, 0, NULL, NULL} }; /* this function is responsible for snapping keyframes to frame-times */ @@ -799,9 +799,9 @@ void ACT_OT_keyframes_sample (wmOperatorType *ot) /* defines for set extrapolation-type for selected keyframes tool */ EnumPropertyItem prop_actkeys_expo_types[] = { - {FCURVE_EXTRAPOLATE_CONSTANT, "CONSTANT", "Constant Extrapolation", ""}, - {FCURVE_EXTRAPOLATE_LINEAR, "LINEAR", "Linear Extrapolation", ""}, - {0, NULL, NULL, NULL} + {FCURVE_EXTRAPOLATE_CONSTANT, "CONSTANT", 0, "Constant Extrapolation", ""}, + {FCURVE_EXTRAPOLATE_LINEAR, "LINEAR", 0, "Linear Extrapolation", ""}, + {0, NULL, 0, NULL, NULL} }; /* this function is responsible for setting extrapolation mode for keyframes */ @@ -1089,11 +1089,11 @@ void ACT_OT_keyframes_cfrasnap (wmOperatorType *ot) /* defines for snap keyframes tool */ EnumPropertyItem prop_actkeys_snap_types[] = { - {ACTKEYS_SNAP_CFRA, "CFRA", "Current frame", ""}, - {ACTKEYS_SNAP_NEAREST_FRAME, "NEAREST_FRAME", "Nearest Frame", ""}, // XXX as single entry? - {ACTKEYS_SNAP_NEAREST_SECOND, "NEAREST_SECOND", "Nearest Second", ""}, // XXX as single entry? - {ACTKEYS_SNAP_NEAREST_MARKER, "NEAREST_MARKER", "Nearest Marker", ""}, - {0, NULL, NULL, NULL} + {ACTKEYS_SNAP_CFRA, "CFRA", 0, "Current frame", ""}, + {ACTKEYS_SNAP_NEAREST_FRAME, "NEAREST_FRAME", 0, "Nearest Frame", ""}, // XXX as single entry? + {ACTKEYS_SNAP_NEAREST_SECOND, "NEAREST_SECOND", 0, "Nearest Second", ""}, // XXX as single entry? + {ACTKEYS_SNAP_NEAREST_MARKER, "NEAREST_MARKER", 0, "Nearest Marker", ""}, + {0, NULL, 0, NULL, NULL} }; /* this function is responsible for snapping keyframes to frame-times */ @@ -1188,11 +1188,11 @@ void ACT_OT_keyframes_snap (wmOperatorType *ot) /* defines for mirror keyframes tool */ EnumPropertyItem prop_actkeys_mirror_types[] = { - {ACTKEYS_MIRROR_CFRA, "CFRA", "Current frame", ""}, - {ACTKEYS_MIRROR_YAXIS, "YAXIS", "Vertical Axis", ""}, - {ACTKEYS_MIRROR_XAXIS, "XAXIS", "Horizontal Axis", ""}, - {ACTKEYS_MIRROR_MARKER, "MARKER", "First Selected Marker", ""}, - {0, NULL, NULL, NULL} + {ACTKEYS_MIRROR_CFRA, "CFRA", 0, "Current frame", ""}, + {ACTKEYS_MIRROR_YAXIS, "YAXIS", 0, "Vertical Axis", ""}, + {ACTKEYS_MIRROR_XAXIS, "XAXIS", 0, "Horizontal Axis", ""}, + {ACTKEYS_MIRROR_MARKER, "MARKER", 0, "First Selected Marker", ""}, + {0, NULL, 0, NULL, NULL} }; /* this function is responsible for mirroring keyframes */ diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index d4782418be7..b82e44f3aa3 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -374,11 +374,11 @@ void ACT_OT_keyframes_select_border(wmOperatorType *ot) /* defines for column-select mode */ static EnumPropertyItem prop_column_select_types[] = { - {ACTKEYS_COLUMNSEL_KEYS, "KEYS", "On Selected Keyframes", ""}, - {ACTKEYS_COLUMNSEL_CFRA, "CFRA", "On Current Frame", ""}, - {ACTKEYS_COLUMNSEL_MARKERS_COLUMN, "MARKERS_COLUMN", "On Selected Markers", ""}, - {ACTKEYS_COLUMNSEL_MARKERS_BETWEEN, "MARKERS_BETWEEN", "Between Min/Max Selected Markers", ""}, - {0, NULL, NULL, NULL} + {ACTKEYS_COLUMNSEL_KEYS, "KEYS", 0, "On Selected Keyframes", ""}, + {ACTKEYS_COLUMNSEL_CFRA, "CFRA", 0, "On Current Frame", ""}, + {ACTKEYS_COLUMNSEL_MARKERS_COLUMN, "MARKERS_COLUMN", 0, "On Selected Markers", ""}, + {ACTKEYS_COLUMNSEL_MARKERS_BETWEEN, "MARKERS_BETWEEN", 0, "Between Min/Max Selected Markers", ""}, + {0, NULL, 0, NULL, NULL} }; /* ------------------- */ @@ -584,11 +584,11 @@ void ACT_OT_keyframes_select_column (wmOperatorType *ot) /* defines for left-right select tool */ static EnumPropertyItem prop_actkeys_leftright_select_types[] = { - {ACTKEYS_LRSEL_TEST, "CHECK", "Check if Select Left or Right", ""}, - {ACTKEYS_LRSEL_NONE, "OFF", "Don't select", ""}, - {ACTKEYS_LRSEL_LEFT, "LEFT", "Before current frame", ""}, - {ACTKEYS_LRSEL_RIGHT, "RIGHT", "After current frame", ""}, - {0, NULL, NULL, NULL} + {ACTKEYS_LRSEL_TEST, "CHECK", 0, "Check if Select Left or Right", ""}, + {ACTKEYS_LRSEL_NONE, "OFF", 0, "Don't select", ""}, + {ACTKEYS_LRSEL_LEFT, "LEFT", 0, "Before current frame", ""}, + {ACTKEYS_LRSEL_RIGHT, "RIGHT", 0, "After current frame", ""}, + {0, NULL, 0, NULL, NULL} }; /* sensitivity factor for frame-selections */ diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index a3d0b50b9a6..49397ed0edd 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -1001,9 +1001,9 @@ void GRAPHEDIT_OT_keyframes_sample (wmOperatorType *ot) /* defines for set extrapolation-type for selected keyframes tool */ EnumPropertyItem prop_graphkeys_expo_types[] = { - {FCURVE_EXTRAPOLATE_CONSTANT, "CONSTANT", "Constant Extrapolation", ""}, - {FCURVE_EXTRAPOLATE_LINEAR, "LINEAR", "Linear Extrapolation", ""}, - {0, NULL, NULL, NULL} + {FCURVE_EXTRAPOLATE_CONSTANT, "CONSTANT", 0, "Constant Extrapolation", ""}, + {FCURVE_EXTRAPOLATE_LINEAR, "LINEAR", 0, "Linear Extrapolation", ""}, + {0, NULL, 0, NULL, NULL} }; /* this function is responsible for setting extrapolation mode for keyframes */ @@ -1371,12 +1371,12 @@ void GRAPHEDIT_OT_keyframes_cfrasnap (wmOperatorType *ot) /* defines for snap keyframes tool */ EnumPropertyItem prop_graphkeys_snap_types[] = { - {GRAPHKEYS_SNAP_CFRA, "CFRA", "Current frame", ""}, - {GRAPHKEYS_SNAP_NEAREST_FRAME, "NEAREST_FRAME", "Nearest Frame", ""}, // XXX as single entry? - {GRAPHKEYS_SNAP_NEAREST_SECOND, "NEAREST_SECOND", "Nearest Second", ""}, // XXX as single entry? - {GRAPHKEYS_SNAP_NEAREST_MARKER, "NEAREST_MARKER", "Nearest Marker", ""}, - {GRAPHKEYS_SNAP_HORIZONTAL, "HORIZONTAL", "Flatten Handles", ""}, - {0, NULL, NULL, NULL} + {GRAPHKEYS_SNAP_CFRA, "CFRA", 0, "Current frame", ""}, + {GRAPHKEYS_SNAP_NEAREST_FRAME, "NEAREST_FRAME", 0, "Nearest Frame", ""}, // XXX as single entry? + {GRAPHKEYS_SNAP_NEAREST_SECOND, "NEAREST_SECOND", 0, "Nearest Second", ""}, // XXX as single entry? + {GRAPHKEYS_SNAP_NEAREST_MARKER, "NEAREST_MARKER", 0, "Nearest Marker", ""}, + {GRAPHKEYS_SNAP_HORIZONTAL, "HORIZONTAL", 0, "Flatten Handles", ""}, + {0, NULL, 0, NULL, NULL} }; /* this function is responsible for snapping keyframes to frame-times */ @@ -1466,11 +1466,11 @@ void GRAPHEDIT_OT_keyframes_snap (wmOperatorType *ot) /* defines for mirror keyframes tool */ EnumPropertyItem prop_graphkeys_mirror_types[] = { - {GRAPHKEYS_MIRROR_CFRA, "CFRA", "Current frame", ""}, - {GRAPHKEYS_MIRROR_YAXIS, "YAXIS", "Vertical Axis", ""}, - {GRAPHKEYS_MIRROR_XAXIS, "XAXIS", "Horizontal Axis", ""}, - {GRAPHKEYS_MIRROR_MARKER, "MARKER", "First Selected Marker", ""}, - {0, NULL, NULL, NULL} + {GRAPHKEYS_MIRROR_CFRA, "CFRA", 0, "Current frame", ""}, + {GRAPHKEYS_MIRROR_YAXIS, "YAXIS", 0, "Vertical Axis", ""}, + {GRAPHKEYS_MIRROR_XAXIS, "XAXIS", 0, "Horizontal Axis", ""}, + {GRAPHKEYS_MIRROR_MARKER, "MARKER", 0, "First Selected Marker", ""}, + {0, NULL, 0, NULL, NULL} }; /* this function is responsible for mirroring keyframes */ diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c index bb923ca6f95..9aaef9fca8a 100644 --- a/source/blender/editors/space_graph/graph_select.c +++ b/source/blender/editors/space_graph/graph_select.c @@ -340,11 +340,11 @@ void GRAPHEDIT_OT_keyframes_select_border(wmOperatorType *ot) /* defines for column-select mode */ static EnumPropertyItem prop_column_select_types[] = { - {GRAPHKEYS_COLUMNSEL_KEYS, "KEYS", "On Selected Keyframes", ""}, - {GRAPHKEYS_COLUMNSEL_CFRA, "CFRA", "On Current Frame", ""}, - {GRAPHKEYS_COLUMNSEL_MARKERS_COLUMN, "MARKERS_COLUMN", "On Selected Markers", ""}, - {GRAPHKEYS_COLUMNSEL_MARKERS_BETWEEN, "MARKERS_BETWEEN", "Between Min/Max Selected Markers", ""}, - {0, NULL, NULL, NULL} + {GRAPHKEYS_COLUMNSEL_KEYS, "KEYS", 0, "On Selected Keyframes", ""}, + {GRAPHKEYS_COLUMNSEL_CFRA, "CFRA", 0, "On Current Frame", ""}, + {GRAPHKEYS_COLUMNSEL_MARKERS_COLUMN, "MARKERS_COLUMN", 0, "On Selected Markers", ""}, + {GRAPHKEYS_COLUMNSEL_MARKERS_BETWEEN, "MARKERS_BETWEEN", 0, "Between Min/Max Selected Markers", ""}, + {0, NULL, 0, NULL, NULL} }; /* ------------------- */ @@ -526,11 +526,11 @@ void GRAPHEDIT_OT_keyframes_columnselect (wmOperatorType *ot) /* defines for left-right select tool */ static EnumPropertyItem prop_graphkeys_leftright_select_types[] = { - {GRAPHKEYS_LRSEL_TEST, "CHECK", "Check if Select Left or Right", ""}, - {GRAPHKEYS_LRSEL_NONE, "OFF", "Don't select", ""}, - {GRAPHKEYS_LRSEL_LEFT, "LEFT", "Before current frame", ""}, - {GRAPHKEYS_LRSEL_RIGHT, "RIGHT", "After current frame", ""}, - {0, NULL, NULL, NULL} + {GRAPHKEYS_LRSEL_TEST, "CHECK", 0, "Check if Select Left or Right", ""}, + {GRAPHKEYS_LRSEL_NONE, "OFF", 0, "Don't select", ""}, + {GRAPHKEYS_LRSEL_LEFT, "LEFT", 0, "Before current frame", ""}, + {GRAPHKEYS_LRSEL_RIGHT, "RIGHT", 0, "After current frame", ""}, + {0, NULL, 0, NULL, NULL} }; /* ------------------- */ diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 378d91c8e32..73a7f570c44 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1412,9 +1412,9 @@ void IMAGE_OT_sample(wmOperatorType *ot) void IMAGE_OT_curves_point_set(wmOperatorType *ot) { static EnumPropertyItem point_items[]= { - {0, "BLACK_POINT", "Black Point", ""}, - {1, "WHITE_POINT", "White Point", ""}, - {0, NULL, NULL, NULL}}; + {0, "BLACK_POINT", 0, "Black Point", ""}, + {1, "WHITE_POINT", 0, "White Point", ""}, + {0, NULL, 0, NULL, NULL}}; /* identifiers */ ot->name= "Set Curves Point"; diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c index 3c37793e8d6..6746c21ebcf 100644 --- a/source/blender/editors/space_node/node_select.c +++ b/source/blender/editors/space_node/node_select.c @@ -177,8 +177,8 @@ static int node_extend_select_invoke(bContext *C, wmOperator *op, wmEvent *event /* operators */ static EnumPropertyItem prop_select_items[] = { - {NODE_SELECT_MOUSE, "NORMAL", "Normal Select", "Select using the mouse"}, - {0, NULL, NULL, NULL}}; + {NODE_SELECT_MOUSE, "NORMAL", 0, "Normal Select", "Select using the mouse"}, + {0, NULL, 0, NULL, NULL}}; void NODE_OT_select_extend(wmOperatorType *ot) { @@ -225,9 +225,9 @@ void NODE_OT_select(wmOperatorType *ot) /* ****** Border Select ****** */ static EnumPropertyItem prop_select_types[] = { - {NODE_EXCLUSIVE, "EXCLUSIVE", "Exclusive", ""}, /* right mouse */ - {NODE_EXTEND, "EXTEND", "Extend", ""}, /* left mouse */ - {0, NULL, NULL, NULL} + {NODE_EXCLUSIVE, "EXCLUSIVE", 0, "Exclusive", ""}, /* right mouse */ + {NODE_EXTEND, "EXTEND", 0, "Extend", ""}, /* left mouse */ + {0, NULL, 0, NULL, NULL} }; static int node_borderselect_exec(bContext *C, wmOperator *op) diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 20ad1b61981..7cd81faede1 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -105,35 +105,35 @@ static int okee() {return 0;} /* XXX */ /* RNA Enums, used in multiple files */ EnumPropertyItem sequencer_prop_effect_types[] = { - {SEQ_CROSS, "CROSS", "Crossfade", "Crossfade effect strip type"}, - {SEQ_ADD, "ADD", "Add", "Add effect strip type"}, - {SEQ_SUB, "SUBTRACT", "Subtract", "Subtract effect strip type"}, - {SEQ_ALPHAOVER, "ALPHA_OVER", "Alpha Over", "Alpha Over effect strip type"}, - {SEQ_ALPHAUNDER, "ALPHA_UNDER", "Alpha Under", "Alpha Under effect strip type"}, - {SEQ_GAMCROSS, "GAMMA_CROSS", "Gamma Cross", "Gamma Cross effect strip type"}, - {SEQ_MUL, "MULTIPLY", "Multiply", "Multiply effect strip type"}, - {SEQ_OVERDROP, "OVER_DROP", "Alpha Over Drop", "Alpha Over Drop effect strip type"}, - {SEQ_PLUGIN, "PLUGIN", "Plugin", "Plugin effect strip type"}, - {SEQ_WIPE, "WIPE", "Wipe", "Wipe effect strip type"}, - {SEQ_GLOW, "GLOW", "Glow", "Glow effect strip type"}, - {SEQ_TRANSFORM, "TRANSFORM", "Transform", "Transform effect strip type"}, - {SEQ_COLOR, "COLOR", "Color", "Color effect strip type"}, - {SEQ_SPEED, "SPEED", "Speed", "Color effect strip type"}, - {0, NULL, NULL, NULL} + {SEQ_CROSS, "CROSS", 0, "Crossfade", "Crossfade effect strip type"}, + {SEQ_ADD, "ADD", 0, "Add", "Add effect strip type"}, + {SEQ_SUB, "SUBTRACT", 0, "Subtract", "Subtract effect strip type"}, + {SEQ_ALPHAOVER, "ALPHA_OVER", 0, "Alpha Over", "Alpha Over effect strip type"}, + {SEQ_ALPHAUNDER, "ALPHA_UNDER", 0, "Alpha Under", "Alpha Under effect strip type"}, + {SEQ_GAMCROSS, "GAMMA_CROSS", 0, "Gamma Cross", "Gamma Cross effect strip type"}, + {SEQ_MUL, "MULTIPLY", 0, "Multiply", "Multiply effect strip type"}, + {SEQ_OVERDROP, "OVER_DROP", 0, "Alpha Over Drop", "Alpha Over Drop effect strip type"}, + {SEQ_PLUGIN, "PLUGIN", 0, "Plugin", "Plugin effect strip type"}, + {SEQ_WIPE, "WIPE", 0, "Wipe", "Wipe effect strip type"}, + {SEQ_GLOW, "GLOW", 0, "Glow", "Glow effect strip type"}, + {SEQ_TRANSFORM, "TRANSFORM", 0, "Transform", "Transform effect strip type"}, + {SEQ_COLOR, "COLOR", 0, "Color", "Color effect strip type"}, + {SEQ_SPEED, "SPEED", 0, "Speed", "Color effect strip type"}, + {0, NULL, 0, NULL, NULL} }; /* mute operator */ EnumPropertyItem sequencer_prop_operate_types[] = { /* better name? */ - {SEQ_SELECTED, "SELECTED", "Selected", ""}, - {SEQ_UNSELECTED, "UNSELECTED", "Unselected ", ""}, - {0, NULL, NULL, NULL} + {SEQ_SELECTED, "SELECTED", 0, "Selected", ""}, + {SEQ_UNSELECTED, "UNSELECTED", 0, "Unselected ", ""}, + {0, NULL, 0, NULL, NULL} }; EnumPropertyItem prop_side_types[] = { - {SEQ_SIDE_LEFT, "LEFT", "Left", ""}, - {SEQ_SIDE_RIGHT, "RIGHT", "Right", ""}, - {SEQ_SIDE_BOTH, "BOTH", "Both", ""}, - {0, NULL, NULL, NULL} + {SEQ_SIDE_LEFT, "LEFT", 0, "Left", ""}, + {SEQ_SIDE_RIGHT, "RIGHT", 0, "Right", ""}, + {SEQ_SIDE_BOTH, "BOTH", 0, "Both", ""}, + {0, NULL, 0, NULL, NULL} }; typedef struct TransSeq { @@ -1726,9 +1726,9 @@ void SEQUENCER_OT_refresh_all(struct wmOperatorType *ot) /* cut operator */ static EnumPropertyItem prop_cut_types[] = { - {SEQ_CUT_SOFT, "SOFT", "Soft", ""}, - {SEQ_CUT_HARD, "HARD", "Hard", ""}, - {0, NULL, NULL, NULL} + {SEQ_CUT_SOFT, "SOFT", 0, "Soft", ""}, + {SEQ_CUT_HARD, "HARD", 0, "Hard", ""}, + {0, NULL, 0, NULL, NULL} }; static int sequencer_cut_exec(bContext *C, wmOperator *op) diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index f43888b08da..95970798e53 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -972,9 +972,9 @@ void TEXT_OT_uncomment(wmOperatorType *ot) enum { TO_SPACES, TO_TABS }; static EnumPropertyItem whitespace_type_items[]= { - {TO_SPACES, "SPACES", "To Spaces", NULL}, - {TO_TABS, "TABS", "To Tabs", NULL}, - {0, NULL, NULL, NULL}}; + {TO_SPACES, "SPACES", 0, "To Spaces", NULL}, + {TO_TABS, "TABS", 0, "To Tabs", NULL}, + {0, NULL, 0, NULL, NULL}}; static int convert_whitespace_exec(bContext *C, wmOperator *op) { @@ -1270,19 +1270,19 @@ void TEXT_OT_markers_clear(wmOperatorType *ot) /************************ move operator ************************/ static EnumPropertyItem move_type_items[]= { - {LINE_BEGIN, "LINE_BEGIN", "Line Begin", ""}, - {LINE_END, "LINE_END", "Line End", ""}, - {FILE_TOP, "FILE_TOP", "File Top", ""}, - {FILE_BOTTOM, "FILE_BOTTOM", "File Bottom", ""}, - {PREV_CHAR, "PREVIOUS_CHARACTER", "Previous Character", ""}, - {NEXT_CHAR, "NEXT_CHARACTER", "Next Character", ""}, - {PREV_WORD, "PREVIOUS_WORD", "Previous Word", ""}, - {NEXT_WORD, "NEXT_WORD", "Next Word", ""}, - {PREV_LINE, "PREVIOUS_LINE", "Previous Line", ""}, - {NEXT_LINE, "NEXT_LINE", "Next Line", ""}, - {PREV_PAGE, "PREVIOUS_PAGE", "Previous Page", ""}, - {NEXT_PAGE, "NEXT_PAGE", "Next Page", ""}, - {0, NULL, NULL, NULL}}; + {LINE_BEGIN, "LINE_BEGIN", 0, "Line Begin", ""}, + {LINE_END, "LINE_END", 0, "Line End", ""}, + {FILE_TOP, "FILE_TOP", 0, "File Top", ""}, + {FILE_BOTTOM, "FILE_BOTTOM", 0, "File Bottom", ""}, + {PREV_CHAR, "PREVIOUS_CHARACTER", 0, "Previous Character", ""}, + {NEXT_CHAR, "NEXT_CHARACTER", 0, "Next Character", ""}, + {PREV_WORD, "PREVIOUS_WORD", 0, "Previous Word", ""}, + {NEXT_WORD, "NEXT_WORD", 0, "Next Word", ""}, + {PREV_LINE, "PREVIOUS_LINE", 0, "Previous Line", ""}, + {NEXT_LINE, "NEXT_LINE", 0, "Next Line", ""}, + {PREV_PAGE, "PREVIOUS_PAGE", 0, "Previous Page", ""}, + {NEXT_PAGE, "NEXT_PAGE", 0, "Next Page", ""}, + {0, NULL, 0, NULL, NULL}}; static void wrap_move_bol(SpaceText *st, ARegion *ar, short sel) { @@ -1613,11 +1613,11 @@ void TEXT_OT_jump(wmOperatorType *ot) /******************* delete operator **********************/ static EnumPropertyItem delete_type_items[]= { - {DEL_NEXT_CHAR, "NEXT_CHARACTER", "Next Character", ""}, - {DEL_PREV_CHAR, "PREVIOUS_CHARACTER", "Previous Character", ""}, - {DEL_NEXT_WORD, "NEXT_WORD", "Next Word", ""}, - {DEL_PREV_WORD, "PREVIOUS_WORD", "Previous Word", ""}, - {0, NULL, NULL, NULL}}; + {DEL_NEXT_CHAR, "NEXT_CHARACTER", 0, "Next Character", ""}, + {DEL_PREV_CHAR, "PREVIOUS_CHARACTER", 0, "Previous Character", ""}, + {DEL_NEXT_WORD, "NEXT_WORD", 0, "Next Word", ""}, + {DEL_PREV_WORD, "PREVIOUS_WORD", 0, "Previous Word", ""}, + {0, NULL, 0, NULL, NULL}}; static int delete_exec(bContext *C, wmOperator *op) { @@ -2469,11 +2469,11 @@ void TEXT_OT_replace_set_selected(wmOperatorType *ot) enum { RESOLVE_IGNORE, RESOLVE_RELOAD, RESOLVE_SAVE, RESOLVE_MAKE_INTERNAL }; static EnumPropertyItem resolution_items[]= { - {RESOLVE_IGNORE, "IGNORE", "Ignore", ""}, - {RESOLVE_RELOAD, "RELOAD", "Reload", ""}, - {RESOLVE_SAVE, "SAVE", "Save", ""}, - {RESOLVE_MAKE_INTERNAL, "MAKE_INTERNAL", "Make Internal", ""}, - {0, NULL, NULL, NULL}}; + {RESOLVE_IGNORE, "IGNORE", 0, "Ignore", ""}, + {RESOLVE_RELOAD, "RELOAD", 0, "Reload", ""}, + {RESOLVE_SAVE, "SAVE", 0, "Save", ""}, + {RESOLVE_MAKE_INTERNAL, "MAKE_INTERNAL", 0, "Make Internal", ""}, + {0, NULL, 0, NULL, NULL}}; /* returns 0 if file on disk is the same or Text is in memory only returns 1 if file has been modified on disk since last local edit diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index b4b35be3ef3..79173d3fec7 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -1320,14 +1320,14 @@ void VIEW3D_OT_zoom_border(wmOperatorType *ot) /* ********************* Changing view operator ****************** */ static EnumPropertyItem prop_view_items[] = { - {V3D_VIEW_FRONT, "FRONT", "Front", "View From the Front"}, - {V3D_VIEW_BACK, "BACK", "Back", "View From the Back"}, - {V3D_VIEW_LEFT, "LEFT", "Left", "View From the Left"}, - {V3D_VIEW_RIGHT, "RIGHT", "Right", "View From the Right"}, - {V3D_VIEW_TOP, "TOP", "Top", "View From the Top"}, - {V3D_VIEW_BOTTOM, "BOTTOM", "Bottom", "View From the Bottom"}, - {V3D_VIEW_CAMERA, "CAMERA", "Camera", "View From the active amera"}, - {0, NULL, NULL, NULL}}; + {V3D_VIEW_FRONT, "FRONT", 0, "Front", "View From the Front"}, + {V3D_VIEW_BACK, "BACK", 0, "Back", "View From the Back"}, + {V3D_VIEW_LEFT, "LEFT", 0, "Left", "View From the Left"}, + {V3D_VIEW_RIGHT, "RIGHT", 0, "Right", "View From the Right"}, + {V3D_VIEW_TOP, "TOP", 0, "Top", "View From the Top"}, + {V3D_VIEW_BOTTOM, "BOTTOM", 0, "Bottom", "View From the Bottom"}, + {V3D_VIEW_CAMERA, "CAMERA", 0, "Camera", "View From the active amera"}, + {0, NULL, 0, NULL, NULL}}; static void axis_set_view(bContext *C, float q1, float q2, float q3, float q4, short view, int perspo) { @@ -1479,11 +1479,11 @@ void VIEW3D_OT_viewnumpad(wmOperatorType *ot) } static EnumPropertyItem prop_view_orbit_items[] = { - {V3D_VIEW_STEPLEFT, "ORBITLEFT", "Orbit Left", "Orbit the view around to the Left"}, - {V3D_VIEW_STEPRIGHT, "ORBITRIGHT", "Orbit Right", "Orbit the view around to the Right"}, - {V3D_VIEW_STEPUP, "ORBITUP", "Orbit Up", "Orbit the view Up"}, - {V3D_VIEW_STEPDOWN, "ORBITDOWN", "Orbit Down", "Orbit the view Down"}, - {0, NULL, NULL, NULL}}; + {V3D_VIEW_STEPLEFT, "ORBITLEFT", 0, "Orbit Left", "Orbit the view around to the Left"}, + {V3D_VIEW_STEPRIGHT, "ORBITRIGHT", 0, "Orbit Right", "Orbit the view around to the Right"}, + {V3D_VIEW_STEPUP, "ORBITUP", 0, "Orbit Up", "Orbit the view Up"}, + {V3D_VIEW_STEPDOWN, "ORBITDOWN", 0, "Orbit Down", "Orbit the view Down"}, + {0, NULL, 0, NULL, NULL}}; static int vieworbit_exec(bContext *C, wmOperator *op) { @@ -1547,11 +1547,11 @@ void VIEW3D_OT_view_orbit(wmOperatorType *ot) } static EnumPropertyItem prop_view_pan_items[] = { - {V3D_VIEW_PANLEFT, "PANLEFT", "Pan Left", "Pan the view to the Left"}, - {V3D_VIEW_PANRIGHT, "PANRIGHT", "Pan Right", "Pan the view to the Right"}, - {V3D_VIEW_PANUP, "PANUP", "Pan Up", "Pan the view Up"}, - {V3D_VIEW_PANDOWN, "PANDOWN", "Pan Down", "Pan the view Down"}, - {0, NULL, NULL, NULL}}; + {V3D_VIEW_PANLEFT, "PANLEFT", 0, "Pan Left", "Pan the view to the Left"}, + {V3D_VIEW_PANRIGHT, "PANRIGHT", 0, "Pan Right", "Pan the view to the Right"}, + {V3D_VIEW_PANUP, "PANUP", 0, "Pan Up", "Pan the view Up"}, + {V3D_VIEW_PANDOWN, "PANDOWN", 0, "Pan Down", "Pan the view Down"}, + {0, NULL, 0, NULL, NULL}}; static int viewpan_exec(bContext *C, wmOperator *op) { diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 9c4f0b576da..e0e8ac7c7a7 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -715,9 +715,9 @@ void view3d_lasso_select(bContext *C, ViewContext *vc, short mcords[][2], short } static EnumPropertyItem lasso_select_types[] = { - {0, "SELECT", "Select", ""}, - {1, "DESELECT", "Deselect", ""}, - {0, NULL, NULL, NULL} + {0, "SELECT", 0, "Select", ""}, + {1, "DESELECT", 0, "Deselect", ""}, + {0, NULL, 0, NULL, NULL} }; @@ -1526,9 +1526,9 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op) /* *****************Selection Operators******************* */ static EnumPropertyItem prop_select_types[] = { - {0, "EXCLUSIVE", "Exclusive", ""}, - {1, "EXTEND", "Extend", ""}, - {0, NULL, NULL, NULL} + {0, "EXCLUSIVE", 0, "Exclusive", ""}, + {1, "EXTEND", 0, "Extend", ""}, + {0, NULL, 0, NULL, NULL} }; /* ****** Border Select ****** */ diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index 769001b30a8..e697b6dfa7d 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -56,29 +56,29 @@ static float VecOne[3] = {1, 1, 1}; /* need constants for this */ EnumPropertyItem proportional_mode_types[] = { - {0, "OFF", "Off", ""}, - {1, "ON", "On", ""}, - {2, "CONNECTED", "Connected", ""}, - {0, NULL, NULL, NULL} + {0, "OFF", 0, "Off", ""}, + {1, "ON", 0, "On", ""}, + {2, "CONNECTED", 0, "Connected", ""}, + {0, NULL, 0, NULL, NULL} }; EnumPropertyItem snap_mode_types[] = { - {SCE_SNAP_TARGET_CLOSEST, "CLOSEST", "Closest", ""}, - {SCE_SNAP_TARGET_CENTER, "CENTER", "Center", ""}, - {SCE_SNAP_TARGET_MEDIAN, "MEDIAN", "Median", ""}, - {SCE_SNAP_TARGET_ACTIVE, "ACTIVE", "Active", ""}, - {0, NULL, NULL, NULL} + {SCE_SNAP_TARGET_CLOSEST, "CLOSEST", 0, "Closest", ""}, + {SCE_SNAP_TARGET_CENTER, "CENTER", 0, "Center", ""}, + {SCE_SNAP_TARGET_MEDIAN, "MEDIAN", 0, "Median", ""}, + {SCE_SNAP_TARGET_ACTIVE, "ACTIVE", 0, "Active", ""}, + {0, NULL, 0, NULL, NULL} }; EnumPropertyItem proportional_falloff_types[] = { - {PROP_SMOOTH, "SMOOTH", "Smooth", ""}, - {PROP_SPHERE, "SPHERE", "Sphere", ""}, - {PROP_ROOT, "ROOT", "Root", ""}, - {PROP_SHARP, "SHARP", "Sharp", ""}, - {PROP_LIN, "LINEAR", "Linear", ""}, - {PROP_CONST, "CONSTANT", "Constant", ""}, - {PROP_RANDOM, "RANDOM", "Random", ""}, - {0, NULL, NULL, NULL} + {PROP_SMOOTH, "SMOOTH", 0, "Smooth", ""}, + {PROP_SPHERE, "SPHERE", 0, "Sphere", ""}, + {PROP_ROOT, "ROOT", 0, "Root", ""}, + {PROP_SHARP, "SHARP", 0, "Sharp", ""}, + {PROP_LIN, "LINEAR", 0, "Linear", ""}, + {PROP_CONST, "CONSTANT", 0, "Constant", ""}, + {PROP_RANDOM, "RANDOM", 0, "Random", ""}, + {0, NULL, 0, NULL, NULL} }; char OP_TRANSLATION[] = "TFM_OT_translation"; @@ -133,12 +133,12 @@ static int select_orientation_invoke(bContext *C, wmOperator *op, wmEvent *event void TFM_OT_select_orientation(struct wmOperatorType *ot) { static EnumPropertyItem orientation_items[]= { - {V3D_MANIP_GLOBAL, "GLOBAL", "Global", ""}, - {V3D_MANIP_NORMAL, "NORMAL", "Normal", ""}, - {V3D_MANIP_LOCAL, "LOCAL", "Local", ""}, - {V3D_MANIP_VIEW, "VIEW", "View", ""}, - {V3D_MANIP_CUSTOM, "CUSTOM", "Custom", ""}, - {0, NULL, NULL, NULL}}; + {V3D_MANIP_GLOBAL, "GLOBAL", 0, "Global", ""}, + {V3D_MANIP_NORMAL, "NORMAL", 0, "Normal", ""}, + {V3D_MANIP_LOCAL, "LOCAL", 0, "Local", ""}, + {V3D_MANIP_VIEW, "VIEW", 0, "View", ""}, + {V3D_MANIP_CUSTOM, "CUSTOM", 0, "Custom", ""}, + {0, NULL, 0, NULL, NULL}}; /* identifiers */ ot->name = "Select Orientation"; @@ -484,33 +484,33 @@ void TFM_OT_tosphere(struct wmOperatorType *ot) void TFM_OT_transform(struct wmOperatorType *ot) { static EnumPropertyItem transform_mode_types[] = { - {TFM_INIT, "INIT", "Init", ""}, - {TFM_DUMMY, "DUMMY", "Dummy", ""}, - {TFM_TRANSLATION, "TRANSLATION", "Translation", ""}, - {TFM_ROTATION, "ROTATION", "Rotation", ""}, - {TFM_RESIZE, "RESIZE", "Resize", ""}, - {TFM_TOSPHERE, "TOSPHERE", "Tosphere", ""}, - {TFM_SHEAR, "SHEAR", "Shear", ""}, - {TFM_WARP, "WARP", "Warp", ""}, - {TFM_SHRINKFATTEN, "SHRINKFATTEN", "Shrinkfatten", ""}, - {TFM_TILT, "TILT", "Tilt", ""}, - {TFM_TRACKBALL, "TRACKBALL", "Trackball", ""}, - {TFM_PUSHPULL, "PUSHPULL", "Pushpull", ""}, - {TFM_CREASE, "CREASE", "Crease", ""}, - {TFM_MIRROR, "MIRROR", "Mirror", ""}, - {TFM_BONESIZE, "BONESIZE", "Bonesize", ""}, - {TFM_BONE_ENVELOPE, "BONE_ENVELOPE", "Bone_Envelope", ""}, - {TFM_CURVE_SHRINKFATTEN, "CURVE_SHRINKFATTEN", "Curve_Shrinkfatten", ""}, - {TFM_BONE_ROLL, "BONE_ROLL", "Bone_Roll", ""}, - {TFM_TIME_TRANSLATE, "TIME_TRANSLATE", "Time_Translate", ""}, - {TFM_TIME_SLIDE, "TIME_SLIDE", "Time_Slide", ""}, - {TFM_TIME_SCALE, "TIME_SCALE", "Time_Scale", ""}, - {TFM_TIME_EXTEND, "TIME_EXTEND", "Time_Extend", ""}, - {TFM_BAKE_TIME, "BAKE_TIME", "Bake_Time", ""}, - {TFM_BEVEL, "BEVEL", "Bevel", ""}, - {TFM_BWEIGHT, "BWEIGHT", "Bweight", ""}, - {TFM_ALIGN, "ALIGN", "Align", ""}, - {0, NULL, NULL, NULL} + {TFM_INIT, "INIT", 0, "Init", ""}, + {TFM_DUMMY, "DUMMY", 0, "Dummy", ""}, + {TFM_TRANSLATION, "TRANSLATION", 0, "Translation", ""}, + {TFM_ROTATION, "ROTATION", 0, "Rotation", ""}, + {TFM_RESIZE, "RESIZE", 0, "Resize", ""}, + {TFM_TOSPHERE, "TOSPHERE", 0, "Tosphere", ""}, + {TFM_SHEAR, "SHEAR", 0, "Shear", ""}, + {TFM_WARP, "WARP", 0, "Warp", ""}, + {TFM_SHRINKFATTEN, "SHRINKFATTEN", 0, "Shrinkfatten", ""}, + {TFM_TILT, "TILT", 0, "Tilt", ""}, + {TFM_TRACKBALL, "TRACKBALL", 0, "Trackball", ""}, + {TFM_PUSHPULL, "PUSHPULL", 0, "Pushpull", ""}, + {TFM_CREASE, "CREASE", 0, "Crease", ""}, + {TFM_MIRROR, "MIRROR", 0, "Mirror", ""}, + {TFM_BONESIZE, "BONESIZE", 0, "Bonesize", ""}, + {TFM_BONE_ENVELOPE, "BONE_ENVELOPE", 0, "Bone_Envelope", ""}, + {TFM_CURVE_SHRINKFATTEN, "CURVE_SHRINKFATTEN", 0, "Curve_Shrinkfatten", ""}, + {TFM_BONE_ROLL, "BONE_ROLL", 0, "Bone_Roll", ""}, + {TFM_TIME_TRANSLATE, "TIME_TRANSLATE", 0, "Time_Translate", ""}, + {TFM_TIME_SLIDE, "TIME_SLIDE", 0, "Time_Slide", ""}, + {TFM_TIME_SCALE, "TIME_SCALE", 0, "Time_Scale", ""}, + {TFM_TIME_EXTEND, "TIME_EXTEND", 0, "Time_Extend", ""}, + {TFM_BAKE_TIME, "BAKE_TIME", 0, "Bake_Time", ""}, + {TFM_BEVEL, "BEVEL", 0, "Bevel", ""}, + {TFM_BWEIGHT, "BWEIGHT", 0, "Bweight", ""}, + {TFM_ALIGN, "ALIGN", 0, "Align", ""}, + {0, NULL, 0, NULL, NULL} }; /* identifiers */ diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 0b82efda7ab..a42008bef0c 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -963,9 +963,9 @@ static int mirror_exec(bContext *C, wmOperator *op) void UV_OT_mirror(wmOperatorType *ot) { static EnumPropertyItem axis_items[] = { - {'x', "MIRROR_X", "Mirror X", "Mirror UVs over X axis."}, - {'y', "MIRROR_Y", "Mirror Y", "Mirror UVs over Y axis."}, - {0, NULL, NULL, NULL}}; + {'x', "MIRROR_X", 0, "Mirror X", "Mirror UVs over X axis."}, + {'y', "MIRROR_Y", 0, "Mirror Y", "Mirror UVs over Y axis."}, + {0, NULL, 0, NULL, NULL}}; /* identifiers */ ot->name= "Mirror"; @@ -1068,10 +1068,10 @@ static int align_exec(bContext *C, wmOperator *op) void UV_OT_align(wmOperatorType *ot) { static EnumPropertyItem axis_items[] = { - {'a', "ALIGN_AUTO", "Align Auto", "Automatically choose the axis on which there is most alignment already."}, - {'x', "ALIGN_X", "Align X", "Align UVs on X axis."}, - {'y', "ALIGN_Y", "Align Y", "Align UVs on Y axis."}, - {0, NULL, NULL, NULL}}; + {'a', "ALIGN_AUTO", 0, "Align Auto", "Automatically choose the axis on which there is most alignment already."}, + {'x', "ALIGN_X", 0, "Align X", "Align UVs on X axis."}, + {'y', "ALIGN_Y", 0, "Align Y", "Align UVs on Y axis."}, + {0, NULL, 0, NULL, NULL}}; /* identifiers */ ot->name= "Align"; @@ -2326,9 +2326,9 @@ static int snap_cursor_exec(bContext *C, wmOperator *op) void UV_OT_snap_cursor(wmOperatorType *ot) { static EnumPropertyItem target_items[] = { - {0, "PIXELS", "Pixels", ""}, - {1, "SELECTION", "Selection", ""}, - {0, NULL, NULL, NULL}}; + {0, "PIXELS", 0, "Pixels", ""}, + {1, "SELECTION", 0, "Selection", ""}, + {0, NULL, 0, NULL, NULL}}; /* identifiers */ ot->name= "Snap Cursor"; @@ -2561,10 +2561,10 @@ static int snap_selection_exec(bContext *C, wmOperator *op) void UV_OT_snap_selection(wmOperatorType *ot) { static EnumPropertyItem target_items[] = { - {0, "PIXELS", "Pixels", ""}, - {1, "CURSOR", "Cursor", ""}, - {2, "ADJACENT_UNSELECTED", "Adjacent Unselected", ""}, - {0, NULL, NULL, NULL}}; + {0, "PIXELS", 0, "Pixels", ""}, + {1, "CURSOR", 0, "Cursor", ""}, + {2, "ADJACENT_UNSELECTED", 0, "Adjacent Unselected", ""}, + {0, NULL, 0, NULL, NULL}}; /* identifiers */ ot->name= "Snap Selection"; diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index 27d0c68ec36..95467d13e8d 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -639,15 +639,15 @@ static void uv_map_transform(bContext *C, wmOperator *op, float center[3], float static void uv_transform_properties(wmOperatorType *ot, int radius) { static EnumPropertyItem direction_items[]= { - {VIEW_ON_EQUATOR, "VIEW_ON_EQUATOR", "View on Equator", "3D view is on the equator."}, - {VIEW_ON_POLES, "VIEW_ON_POLES", "View on Poles", "3D view is on the poles."}, - {ALIGN_TO_OBJECT, "ALIGN_TO_OBJECT", "Align to Object", "Align according to object transform."}, - {0, NULL, NULL, NULL} + {VIEW_ON_EQUATOR, "VIEW_ON_EQUATOR", 0, "View on Equator", "3D view is on the equator."}, + {VIEW_ON_POLES, "VIEW_ON_POLES", 0, "View on Poles", "3D view is on the poles."}, + {ALIGN_TO_OBJECT, "ALIGN_TO_OBJECT", 0, "Align to Object", "Align according to object transform."}, + {0, NULL, 0, NULL, NULL} }; static EnumPropertyItem align_items[]= { - {POLAR_ZX, "POLAR_ZX", "Polar ZX", "Polar 0 is X."}, - {POLAR_ZY, "POLAR_ZY", "Polar ZY", "Polar 0 is Y."}, - {0, NULL, NULL, NULL} + {POLAR_ZX, "POLAR_ZX", 0, "Polar ZX", "Polar 0 is X."}, + {POLAR_ZY, "POLAR_ZY", 0, "Polar ZY", "Polar 0 is Y."}, + {0, NULL, 0, NULL, NULL} }; RNA_def_enum(ot->srna, "direction", direction_items, VIEW_ON_EQUATOR, "Direction", "Direction of the sphere or cylinder."); @@ -820,9 +820,9 @@ static int unwrap_exec(bContext *C, wmOperator *op) void UV_OT_unwrap(wmOperatorType *ot) { static EnumPropertyItem method_items[] = { - {0, "ANGLE_BASED", "Angle Based", ""}, - {1, "CONFORMAL", "Conformal", ""}, - {0, NULL, NULL, NULL}}; + {0, "ANGLE_BASED", 0, "Angle Based", ""}, + {1, "CONFORMAL", 0, "Conformal", ""}, + {0, NULL, 0, NULL, NULL}}; /* identifiers */ ot->name= "Unwrap"; |