From 42825dc1fc03609efed30259fa69cc31819be31c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 11 Sep 2015 18:41:35 +1000 Subject: Fix T46074: Collada crashes importing animation double-frees and freeing memory already inserted into Blender. --- source/blender/collada/AnimationImporter.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source/blender/collada/AnimationImporter.h') 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& curves, char *rna_path, int array_index, Animation *animated); + int typeFlag; -- cgit v1.2.3