diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-29 13:59:17 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-31 14:04:57 +0300 |
| commit | 83f8f44791374dd051728e44d89fbdeee15c60aa (patch) | |
| tree | addcd6991adfcf578bec05b022875c98509deda9 /source/blender/makesdna/DNA_anim_types.h | |
| parent | 7400aa7e595063510ce9f29fa1b02ebd3f9296e2 (diff) | |
Fix T59495, T59992, T59904, T59178, T60598: broken keyframed value editing.
This removes a bunch of animation/driver evaluations and recalc flags that
should be redundant in the new depsgraph, and were incorrectly affecting
the evaluated scene in a permanent way.
Still two cases that could be removed if the depsgraph is improved, in
BKE_object_handle_data_update and BKE_cachefile_update_frame.
For physics subframe interpolation there are also still calls to
BKE_object_where_is_calc that should ideally be removed as well, though
they are not known to cause keyframing bugs.
Differential Revision: https://developer.blender.org/D4274
Diffstat (limited to 'source/blender/makesdna/DNA_anim_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_anim_types.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index 4fb0a19dfc8..14ebc2f4aa2 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -520,8 +520,7 @@ typedef enum eDriver_Types { typedef enum eDriver_Flags { /* driver has invalid settings (internal flag) */ DRIVER_FLAG_INVALID = (1<<0), - /* driver needs recalculation (set by depsgraph) */ - DRIVER_FLAG_RECALC = (1<<1), + DRIVER_FLAG_DEPRECATED = (1<<1), /* driver does replace value, but overrides (for layering of animation over driver) */ // TODO: this needs to be implemented at some stage or left out... //DRIVER_FLAG_LAYERING = (1<<2), @@ -1058,8 +1057,7 @@ typedef struct AnimData { /* settings for animation evaluation */ /** User-defined settings. */ int flag; - /** Depsgraph recalculation flags. */ - int recalc; + int pad; /* settings for active action evaluation (based on NLA strip settings) */ /** Accumulation mode for active action. */ @@ -1100,13 +1098,6 @@ typedef enum eAnimData_Flag { ADT_CURVES_ALWAYS_VISIBLE = (1<<17), } eAnimData_Flag; -/* Animation Data recalculation settings (to be set by depsgraph) */ -typedef enum eAnimData_Recalc { - ADT_RECALC_DRIVERS = (1 << 0), - ADT_RECALC_ANIM = (1 << 1), - ADT_RECALC_ALL = (ADT_RECALC_DRIVERS | ADT_RECALC_ANIM), -} eAnimData_Recalc; - /* Base Struct for Anim ------------------------------------- */ /* Used for BKE_animdata_from_id() |