From 40a1c8b4ed1e766e37475d5e6367b0f96556d7cc Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Wed, 8 Aug 2012 14:02:18 +0000 Subject: Disable saving property defaults for many of the properties for animation-editor click activated operators to prevent any further errors --- source/blender/editors/space_nla/nla_channels.c | 7 +++++-- source/blender/editors/space_nla/nla_select.c | 19 ++++++++++++++----- 2 files changed, 19 insertions(+), 7 deletions(-) (limited to 'source/blender/editors/space_nla') 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); } /* *********************************************** */ -- cgit v1.2.3