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

[Dalai Felinto]

Commit: 56be796099235a6a5e98fbc29e9efbc78f758880
Author: Dalai Felinto
Date:   Thu Jan 15 14:28:13 2015 -0200
Branches: multiview
https://developer.blender.org/rB56be796099235a6a5e98fbc29e9efbc78f758880

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

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



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

diff --cc source/blender/blenkernel/intern/image.c
index 0af42a2,870c077..7e36c0b
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@@ -445,11 -381,13 +445,15 @@@ Image *BKE_image_copy(Main *bmain, Imag
  
  	BKE_color_managed_colorspace_settings_copy(&nima->colorspace_settings, &ima->colorspace_settings);
  
 -	if (ima->packedfile)
 -		nima->packedfile = dupPackedFile(ima->packedfile);
 +	copy_image_packedfiles(&nima->packedfiles, &ima->packedfiles);
 +
 +	nima->stereo3d_format = MEM_dupallocN(ima->stereo3d_format);
 +	BLI_duplicatelist(&nima->views, &ima->views);
  
+ 	if (ima->id.lib) {
+ 		BKE_id_lib_local_paths(bmain, ima->id.lib, &nima->id);
+ 	}
+ 
  	return nima;
  }