diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-12-29 17:15:37 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-01 20:32:48 +0400 |
commit | fe00175c35a301a68518c583a4fab163ac8f32a0 (patch) | |
tree | 284c8b5a7131571c5b62dde861c0baa968fa41cc /source/blender/makesdna/DNA_anim_types.h | |
parent | 5d701c6d25a1c5cea65b15cbcc88b4c745164cc2 (diff) |
Fix crash happening in Cycles fcurve modifier
Summary:
Crash was happening because of fcurve modifier stack
used modifier's DNA to store temporary data.
Now made it so storage for such a thing is being
allocated locally per object update so multiple objects
which shares the same animation wouldn't run into
threading conflict anymore.
This storage might be a part of EvaluationContext,
but that'd mean passing this context all over in
object_where_is which will clutter API for now without
actual benefit for this.
Optimization notes: storage is only being allocated
if there're Cycles modifier in the stack, so there're
no extra allocations happening in all other cases.
To make code a bit less cluttered with this storage
passing all over the place added extra callbacks to
the FModifier storage which runs evaluation with the
given storage.
Reviewers: brecht, campbellbarton, aligorith
CC: plasmasolutions
Differential Revision: https://developer.blender.org/D147
Diffstat (limited to 'source/blender/makesdna/DNA_anim_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_anim_types.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index 7a7e08138b0..6f5c9254a38 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -53,7 +53,6 @@ typedef struct FModifier { struct FModifier *next, *prev; void *data; /* pointer to modifier data */ - void *edata; /* pointer to temporary data used during evaluation */ char name[64]; /* user-defined description for the modifier */ short type; /* type of f-curve modifier */ |