bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Curve pinning: Allow pinning object data without animated object

Browse Source 
Special case, so now we can pin tricky cases like animated camera DOF
without requiring to have animation on the object level.
This commit is contained in:
Sergey Sharybin 2016-09-28 15:18:15 +02:00
parent cbd3827d83
commit dea7ef4dd9
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/animation/anim_channels_defines.c
View File

@ -390,7 +390,10 @@ static bool acf_generic_dataexpand_setting_valid(bAnimContext *ac, bAnimListElem
/* select is ok for most "ds*" channels (e.g. dsmat) */
case ACHANNEL_SETTING_SELECT:
return true;
case ACHANNEL_SETTING_ALWAYS_VISIBLE:
return true;
/* other flags are never supported */
default:
return false;
@ -1704,7 +1707,10 @@ static int acf_dscam_setting_flag(bAnimContext *UNUSED(ac), eAnimChannel_Setting
case ACHANNEL_SETTING_SELECT: /* selected */
return ADT_UI_SELECTED;
case ACHANNEL_SETTING_ALWAYS_VISIBLE:
return ADT_CURVES_ALWAYS_VISIBLE;
default: /* unsupported */
return 0;
}
@ -1725,6 +1731,7 @@ static void *acf_dscam_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings set
case ACHANNEL_SETTING_SELECT: /* selected */
case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */
case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
case ACHANNEL_SETTING_ALWAYS_VISIBLE:
if (ca->adt)
return GET_ACF_FLAG_PTR(ca->adt->flag, type);
return NULL;

13
source/blender/editors/animation/anim_filter.c
View File

@ -2834,6 +2834,19 @@ static bool animdata_filter_base_is_ok(bDopeSheet *ads, Scene *scene, Base *base
return true;
}
/* Special case.
* We don't do recursive checks for pin, but we need to deal with tricky
* setup like animated camera lens without animated camera location.
* Without such special handle here we wouldn't be able to bin such
* camera data only animation to the editor.
*/
if (ob->adt == NULL && ob->data != NULL) {
AnimData *data_adt = BKE_animdata_from_id(ob->data);
if (data_adt != NULL && (data_adt->flag & ADT_CURVES_ALWAYS_VISIBLE)) {
return true;
}
}
/* check selection and object type filters */
if ((ads->filterflag & ADS_FILTER_ONLYSEL) && !((base->flag & SELECT) /*|| (base == sce->basact)*/)) {
/* only selected should be shown */