diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-09-11 11:41:35 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-09-11 11:46:08 +0300 |
| commit | 42825dc1fc03609efed30259fa69cc31819be31c (patch) | |
| tree | c1184b094c71d9f06d4ed05e0fb29c5b976fe408 /source/blender/collada/AnimationImporter.h | |
| parent | 2f1e51a1f33a07b947a92d91a4849bce6a57135f (diff) | |
Fix T46074: Collada crashes importing animation
double-frees and freeing memory already inserted into Blender.
Diffstat (limited to 'source/blender/collada/AnimationImporter.h')
| -rw-r--r-- | source/blender/collada/AnimationImporter.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/collada/AnimationImporter.h b/source/blender/collada/AnimationImporter.h index 565fe183d02..15dee8ff5f4 100644 --- a/source/blender/collada/AnimationImporter.h +++ b/source/blender/collada/AnimationImporter.h @@ -85,7 +85,10 @@ private: void fcurve_deg_to_rad(FCurve *cu); + void fcurve_is_used(FCurve *fcu); + void add_fcurves_to_object(Object *ob, std::vector<FCurve*>& curves, char *rna_path, int array_index, Animation *animated); + int typeFlag; |