From a2a9b6b9a3287a59139f1c371731e9b19e71f686 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Tue, 9 Oct 2012 00:59:40 +0000 Subject: [PATCH] Made the autokeying warning optional by adding a user pref for this By default, this is enabled, so that newbie users who are most likely to be caught short by this will get the benefits of this option, while seasoned animators are likely to know where to go to turn things off (i.e. the scratch- an-itch urge is quite a powerful motivating force...) --- release/scripts/startup/bl_ui/space_userpref.py | 1 + source/blender/editors/transform/transform.c | 8 +++++--- source/blender/makesdna/DNA_userdef_types.h | 1 + source/blender/makesrna/intern/rna_userdef.c | 5 +++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 0c3c0e5a696..df30c3ee9ae 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -324,6 +324,7 @@ class USERPREF_PT_edit(Panel): col.separator() col.prop(edit, "use_auto_keying", text="Auto Keyframing:") + col.prop(edit, "use_auto_keying_warning") sub = col.column() diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index ef32829a71e..2fe68b20806 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1617,9 +1617,11 @@ static void drawTransformPixel(const struct bContext *UNUSED(C), ARegion *ar, vo Object *ob = OBACT; /* draw autokeyframing hint in the corner */ - if (ob && autokeyframe_cfra_can_key(scene, &ob->id)) { - drawAutoKeyWarning(t, ar); - } + if ((U.autokey_flag & AUTOKEY_FLAG_NOWARNING) == 0) { + if (ob && autokeyframe_cfra_can_key(scene, &ob->id)) { + drawAutoKeyWarning(t, ar); + } + } } void saveTransform(bContext *C, TransInfo *t, wmOperator *op) diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 218027209a8..4c196a15db1 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -544,6 +544,7 @@ extern UserDef U; /* from blenkernel blender.c */ /* toolsettings->autokey_flag */ #define AUTOKEY_FLAG_ONLYKEYINGSET (1<<6) +#define AUTOKEY_FLAG_NOWARNING (1<<7) #define ANIMRECORD_FLAG_WITHNLA (1<<10) /* transopts */ diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 9c989121aa4..e1cf7a13f59 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -2745,6 +2745,11 @@ static void rna_def_userdef_edit(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "autokey_flag", AUTOKEY_FLAG_INSERTAVAIL); RNA_def_property_ui_text(prop, "Auto Keyframe Insert Available", "Automatic keyframe insertion in available F-Curves"); + + prop = RNA_def_property(srna, "use_auto_keying_warning", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_negative_sdna(prop, NULL, "autokey_flag", AUTOKEY_FLAG_NOWARNING); + RNA_def_property_ui_text(prop, "Show Auto Keying Warning", + "Show warning indicators when transforming Object and Bones if Auto Keying is enabled"); /* keyframing settings */ prop = RNA_def_property(srna, "use_keyframe_insert_needed", PROP_BOOLEAN, PROP_NONE);