From 3b9700aa5171c7abb3fd14270ebb3a2b4e0e8b83 Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Mon, 12 Nov 2018 19:30:25 +0300 Subject: Remove AnimMapper: it has been left unimplemented for almost ten years. It was supposed to be a feature for substituting RNA paths on the fly, but has never been implemented, apart from a couple of structure definitions and passing around some always-NULL pointers. Now it gets in the way of refactoring NLA evaluation to use GHash for efficiency. --- source/blender/makesdna/DNA_anim_types.h | 41 -------------------------------- 1 file changed, 41 deletions(-) (limited to 'source/blender/makesdna/DNA_anim_types.h') diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index 4fee5fc6d70..515e84c917d 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -565,42 +565,6 @@ typedef enum eFCurve_Smoothing { */ -/* ************************************************ */ -/* Animation Reuse - i.e. users of Actions */ - -/* Retargetting ----------------------------------- */ - -/* Retargetting Pair - * - * Defines what parts of the paths should be remapped from 'abc' to 'xyz'. - * TODO: - * - Regrex (possibly provided through PY, though having our own module might be faster) - * would be important to have at some point. Current replacements are just simple - * string matches... - */ -typedef struct AnimMapPair { - char from[128]; /* part of path to bed replaced */ - char to[128]; /* part of path to replace with */ -} AnimMapPair; - -/* Retargetting Information for Actions - * - * This should only be used if it is strictly necessary (i.e. user will need to explicitly - * add this when they find that some channels do not match, or motion is not going to right - * places). When executing an action, this will be checked to see if it provides any useful - * remaps for the given paths. - * - * NOTE: we currently don't store this in the Action itself, as that causes too many problems. - */ -// FIXME: will this be too clumsy or slow? If we're using RNA paths anyway, we'll have to accept -// such consequences... -typedef struct AnimMapper { - struct AnimMapper *next, *prev; - - bAction *target; /* target action */ - ListBase mappings; /* remapping table (bAnimMapPair) */ -} AnimMapper; - /* ************************************************ */ /* NLA - Non-Linear Animation */ @@ -616,7 +580,6 @@ typedef struct NlaStrip { ListBase strips; /* 'Child' strips (used for 'meta' strips) */ bAction *act; /* Action that is referenced by this strip (strip is 'user' of the action) */ - AnimMapper *remap; /* Remapping info this strip (for tweaking correspondence of action with context) */ ListBase fcurves; /* F-Curves for controlling this strip's influence and timing */ // TODO: move out? ListBase modifiers; /* F-Curve modifiers to be applied to the entire strip's referenced F-Curves */ @@ -902,10 +865,6 @@ typedef struct AnimData { * took over to be edited in the Animation Editors) */ bAction *tmpact; - /* remapping-info for active action - should only be used if needed - * (for 'foreign' actions that aren't working correctly) - */ - AnimMapper *remap; /* nla-tracks */ ListBase nla_tracks; -- cgit v1.2.3