[Bf-blender-cvs] [09dc8a7] master: Fix T49181: Movie clip animation lost when invoking action which reloads the clip

[Sergey Sharybin]

Commit: 09dc8a7954a9ded72f5b3b30fcf7953be29301da
Author: Sergey Sharybin
Date:   Mon Aug 29 13:09:03 2016 +0200
Branches: master
https://developer.blender.org/rB09dc8a7954a9ded72f5b3b30fcf7953be29301da

Fix T49181: Movie clip animation lost when invoking action which reloads the 
clip

Was a bug since the very beginning of movie clip animation support
which was done on Feb 2012.

===================================================================

M       source/blender/blenkernel/intern/movieclip.c

===================================================================

diff --git a/source/blender/blenkernel/intern/movieclip.c 
b/source/blender/blenkernel/intern/movieclip.c
index 482015d..6794a8e 100644
--- a/source/blender/blenkernel/intern/movieclip.c
+++ b/source/blender/blenkernel/intern/movieclip.c
@@ -1247,8 +1247,6 @@ static void free_buffers(MovieClip *clip)
                IMB_free_anim(clip->anim);
                clip->anim = NULL;
        }
-
-       BKE_animdata_free((ID *) clip, false);
 }
 
 void BKE_movieclip_clear_cache(MovieClip *clip)
@@ -1487,6 +1485,7 @@ void BKE_movieclip_free(MovieClip *clip)
        free_buffers(clip);
 
        BKE_tracking_free(&clip->tracking);
+       BKE_animdata_free((ID *) clip, false);
 }
 
 MovieClip *BKE_movieclip_copy(Main *bmain, MovieClip *clip)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs