sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Made the autokeying warning optional by adding a user pref for this

Browse Source 
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...)
This commit is contained in:
Joshua Leung 2012-10-09 00:59:40 +00:00
parent 6536e2d01a
commit a2a9b6b9a3
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
release/scripts/startup/bl_ui/space_userpref.py
View File

@ -324,6 +324,7 @@ class USERPREF_PT_edit(Panel):
col.separator() col.separator()
col.prop(edit, "use_auto_keying", text="Auto Keyframing:") col.prop(edit, "use_auto_keying", text="Auto Keyframing:")
col.prop(edit, "use_auto_keying_warning")
sub = col.column() sub = col.column()

8
source/blender/editors/transform/transform.c
View File

@ -1617,9 +1617,11 @@ static void drawTransformPixel(const struct bContext *UNUSED(C), ARegion *ar, vo
Object *ob = OBACT; Object *ob = OBACT;
/* draw autokeyframing hint in the corner */ /* draw autokeyframing hint in the corner */
if (ob && autokeyframe_cfra_can_key(scene, &ob->id)) { if ((U.autokey_flag & AUTOKEY_FLAG_NOWARNING) == 0) {
drawAutoKeyWarning(t, ar); if (ob && autokeyframe_cfra_can_key(scene, &ob->id)) {
} drawAutoKeyWarning(t, ar);
}
}
} }
void saveTransform(bContext *C, TransInfo *t, wmOperator *op) void saveTransform(bContext *C, TransInfo *t, wmOperator *op)

1
source/blender/makesdna/DNA_userdef_types.h
View File

@ -544,6 +544,7 @@ extern UserDef U; /* from blenkernel blender.c */
/* toolsettings->autokey_flag */ /* toolsettings->autokey_flag */
#define AUTOKEY_FLAG_ONLYKEYINGSET (1<<6) #define AUTOKEY_FLAG_ONLYKEYINGSET (1<<6)
#define AUTOKEY_FLAG_NOWARNING (1<<7)
#define ANIMRECORD_FLAG_WITHNLA (1<<10) #define ANIMRECORD_FLAG_WITHNLA (1<<10)
/* transopts */ /* transopts */

5
source/blender/makesrna/intern/rna_userdef.c
View File

@ -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_boolean_sdna(prop, NULL, "autokey_flag", AUTOKEY_FLAG_INSERTAVAIL);
RNA_def_property_ui_text(prop, "Auto Keyframe Insert Available", RNA_def_property_ui_text(prop, "Auto Keyframe Insert Available",
"Automatic keyframe insertion in available F-Curves"); "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 */ /* keyframing settings */
prop = RNA_def_property(srna, "use_keyframe_insert_needed", PROP_BOOLEAN, PROP_NONE); prop = RNA_def_property(srna, "use_keyframe_insert_needed", PROP_BOOLEAN, PROP_NONE);