diff options
author | Joshua Leung <aligorith@gmail.com> | 2012-08-08 18:02:18 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2012-08-08 18:02:18 +0400 |
commit | 40a1c8b4ed1e766e37475d5e6367b0f96556d7cc (patch) | |
tree | a53f00547a66ff2f4491662a1008d8e9d65bacd5 | |
parent | 73c191b53483530a3acc3f7a9eefda0e161bd9c2 (diff) |
Disable saving property defaults for many of the properties for animation-editor
click activated operators to prevent any further errors
-rw-r--r-- | source/blender/editors/space_action/action_select.c | 20 | ||||
-rw-r--r-- | source/blender/editors/space_graph/graph_select.c | 24 | ||||
-rw-r--r-- | source/blender/editors/space_nla/nla_channels.c | 7 | ||||
-rw-r--r-- | source/blender/editors/space_nla/nla_select.c | 19 |
4 files changed, 53 insertions, 17 deletions
diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index b42c6406362..4da283733b0 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -184,6 +184,7 @@ void ACTION_OT_select_all_toggle(wmOperatorType *ot) /* props */ ot->prop = RNA_def_boolean(ot->srna, "invert", 0, "Invert", ""); + RNA_def_property_flag(ot->prop, PROP_SKIP_SAVE); } /* ******************** Border Select Operator **************************** */ @@ -881,6 +882,8 @@ static int actkeys_select_leftright_invoke(bContext *C, wmOperator *op, wmEvent void ACTION_OT_select_leftright(wmOperatorType *ot) { + PropertyRNA *prop; + /* identifiers */ ot->name = "Select Left/Right"; ot->idname = "ACTION_OT_select_leftright"; @@ -894,9 +897,12 @@ void ACTION_OT_select_leftright(wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - /* id-props */ + /* properties */ ot->prop = RNA_def_enum(ot->srna, "mode", prop_actkeys_leftright_select_types, ACTKEYS_LRSEL_TEST, "Mode", ""); - RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); + RNA_def_property_flag(ot->prop, PROP_SKIP_SAVE); + + prop = RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); + RNA_def_property_flag(prop, PROP_SKIP_SAVE); } /* ******************** Mouse-Click Select Operator *********************** */ @@ -1233,6 +1239,8 @@ static int actkeys_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *even void ACTION_OT_clickselect(wmOperatorType *ot) { + PropertyRNA *prop; + /* identifiers */ ot->name = "Mouse Select Keys"; ot->idname = "ACTION_OT_clickselect"; @@ -1245,9 +1253,11 @@ void ACTION_OT_clickselect(wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - /* id-props */ - RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY - RNA_def_boolean(ot->srna, "column", 0, "Column Select", ""); // ALTKEY + /* properties */ + prop = RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY + RNA_def_property_flag(prop, PROP_SKIP_SAVE); + prop = RNA_def_boolean(ot->srna, "column", 0, "Column Select", ""); // ALTKEY + RNA_def_property_flag(prop, PROP_SKIP_SAVE); } /* ************************************************************************** */ diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c index 52a7f9b115c..109241ac366 100644 --- a/source/blender/editors/space_graph/graph_select.c +++ b/source/blender/editors/space_graph/graph_select.c @@ -848,6 +848,8 @@ static int graphkeys_select_leftright_invoke(bContext *C, wmOperator *op, wmEven void GRAPH_OT_select_leftright(wmOperatorType *ot) { + PropertyRNA *prop; + /* identifiers */ ot->name = "Select Left/Right"; ot->idname = "GRAPH_OT_select_leftright"; @@ -863,7 +865,10 @@ void GRAPH_OT_select_leftright(wmOperatorType *ot) /* id-props */ ot->prop = RNA_def_enum(ot->srna, "mode", prop_graphkeys_leftright_select_types, GRAPHKEYS_LRSEL_TEST, "Mode", ""); - RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); + RNA_def_property_flag(ot->prop, PROP_SKIP_SAVE); + + prop = RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); + RNA_def_property_flag(prop, PROP_SKIP_SAVE); } /* ******************** Mouse-Click Select Operator *********************** */ @@ -1333,6 +1338,8 @@ static int graphkeys_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *ev void GRAPH_OT_clickselect(wmOperatorType *ot) { + PropertyRNA *prop; + /* identifiers */ ot->name = "Mouse Select Keys"; ot->idname = "GRAPH_OT_clickselect"; @@ -1342,10 +1349,17 @@ void GRAPH_OT_clickselect(wmOperatorType *ot) ot->invoke = graphkeys_clickselect_invoke; ot->poll = graphop_visible_keyframes_poll; - /* id-props */ - RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY - RNA_def_boolean(ot->srna, "column", 0, "Column Select", "Select all keyframes that occur on the same frame as the one under the mouse"); // ALTKEY - RNA_def_boolean(ot->srna, "curves", 0, "Only Curves", "Select all the keyframes in the curve"); // CTRLKEY + ALTKEY + /* properties */ + prop = RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY + RNA_def_property_flag(prop, PROP_SKIP_SAVE); + + prop = RNA_def_boolean(ot->srna, "column", 0, "Column Select", + "Select all keyframes that occur on the same frame as the one under the mouse"); // ALTKEY + RNA_def_property_flag(prop, PROP_SKIP_SAVE); + + prop = RNA_def_boolean(ot->srna, "curves", 0, "Only Curves", + "Select all the keyframes in the curve"); // CTRLKEY + ALTKEY + RNA_def_property_flag(prop, PROP_SKIP_SAVE); } /* ************************************************************************** */ diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index af790443928..b3a869ed57d 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -343,6 +343,8 @@ static int nlachannels_mouseclick_invoke(bContext *C, wmOperator *op, wmEvent *e void NLA_OT_channels_click(wmOperatorType *ot) { + PropertyRNA *prop; + /* identifiers */ ot->name = "Mouse Click on NLA Channels"; ot->idname = "NLA_OT_channels_click"; @@ -355,8 +357,9 @@ void NLA_OT_channels_click(wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - /* id-props */ - RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY + /* props */ + prop = RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY + RNA_def_property_flag(prop, PROP_SKIP_SAVE); } /* *********************************************** */ diff --git a/source/blender/editors/space_nla/nla_select.c b/source/blender/editors/space_nla/nla_select.c index 1ba15d529e8..3736f83bce2 100644 --- a/source/blender/editors/space_nla/nla_select.c +++ b/source/blender/editors/space_nla/nla_select.c @@ -198,7 +198,8 @@ void NLA_OT_select_all_toggle(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER /*|OPTYPE_UNDO*/; /* props */ - RNA_def_boolean(ot->srna, "invert", 0, "Invert", ""); + ot->prop = RNA_def_boolean(ot->srna, "invert", 0, "Invert", ""); + RNA_def_property_flag(ot->prop, PROP_SKIP_SAVE); } /* ******************** Border Select Operator **************************** */ @@ -483,6 +484,8 @@ static int nlaedit_select_leftright_invoke(bContext *C, wmOperator *op, wmEvent void NLA_OT_select_leftright(wmOperatorType *ot) { + PropertyRNA *prop; + /* identifiers */ ot->name = "Select Left/Right"; ot->idname = "NLA_OT_select_leftright"; @@ -496,9 +499,12 @@ void NLA_OT_select_leftright(wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - /* id-props */ + /* properties */ ot->prop = RNA_def_enum(ot->srna, "mode", prop_nlaedit_leftright_select_types, NLAEDIT_LRSEL_TEST, "Mode", ""); - RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); + RNA_def_property_flag(ot->prop, PROP_SKIP_SAVE); + + prop = RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); + RNA_def_property_flag(prop, PROP_SKIP_SAVE); } @@ -645,6 +651,8 @@ static int nlaedit_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *even void NLA_OT_click_select(wmOperatorType *ot) { + PropertyRNA *prop; + /* identifiers */ ot->name = "Mouse Select"; ot->idname = "NLA_OT_click_select"; @@ -657,8 +665,9 @@ void NLA_OT_click_select(wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - /* id-props */ - RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY + /* properties */ + prop = RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY + RNA_def_property_flag(prop, PROP_SKIP_SAVE); } /* *********************************************** */ |