[Bf-blender-cvs] [df888ef] multiview: Merge remote-tracking branch 'origin/master' into multiview

[Dalai Felinto]

Commit: df888ef0cf7ac09ca63d0f57901e347c84bba966
Author: Dalai Felinto
Date:   Wed Oct 22 22:53:55 2014 +0200
Branches: multiview
https://developer.blender.org/rBdf888ef0cf7ac09ca63d0f57901e347c84bba966

Merge remote-tracking branch 'origin/master' into multiview

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



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

diff --cc source/blender/blenkernel/intern/image.c
index 2540a28,54f5cb7..b5801fc
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@@ -311,9 -263,10 +311,9 @@@ static void image_free_anims(Image *ima
   */
  void BKE_image_free_buffers(Image *ima)
  {
- 	image_free_cahced_frames(ima);
+ 	image_free_cached_frames(ima);
  
 -	if (ima->anim) IMB_free_anim(ima->anim);
 -	ima->anim = NULL;
 +	image_free_anims(ima);
  
  	if (ima->rr) {
  		RE_FreeRenderResult(ima->rr);
diff --cc source/blender/blenloader/intern/readfile.c
index 4143e3d,d99500d..be62a58
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -3314,11 -3309,9 +3320,11 @@@ static void lib_link_image(FileData *fd
  
  static void direct_link_image(FileData *fd, Image *ima)
  {
 +	ImagePackedFile *imapf;
 +
  	/* for undo system, pointers could be restored */
  	if (fd->imamap)
- 		ima->cache = newmclipadr(fd, ima->cache);
+ 		ima->cache = newimaadr(fd, ima->cache);
  	else
  		ima->cache = NULL;