[Bf-blender-cvs] [00ebb1e] alembic_basic_io: Merge branch 'master' into alembic_basic_io

[Kévin Dietrich]

Commit: 00ebb1e2ddcd39dce0e888cbdc529652611135ee
Author: Kévin Dietrich
Date:   Mon Jul 11 05:18:53 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB00ebb1e2ddcd39dce0e888cbdc529652611135ee

Merge branch 'master' into alembic_basic_io

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



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

diff --cc source/blender/blenkernel/intern/library.c
index 87f222c,3dc7997..7f535aa
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@@ -441,17 -429,14 +434,17 @@@ bool id_copy(Main *bmain, ID *id, ID **
  		case ID_WM:
  			return false;  /* can't be copied from here */
  		case ID_GD:
- 			if (!test) *newid = (ID *)gpencil_data_duplicate((bGPdata *)id, false);
+ 			if (!test) *newid = (ID *)gpencil_data_duplicate(bmain, (bGPdata *)id, false);
  			return true;
  		case ID_MSK:
- 			if (!test) *newid = (ID *)BKE_mask_copy((Mask *)id);
+ 			if (!test) *newid = (ID *)BKE_mask_copy(bmain, (Mask *)id);
  			return true;
  		case ID_LS:
- 			if (!test) *newid = (ID *)BKE_linestyle_copy(G.main, (FreestyleLineStyle *)id);
+ 			if (!test) *newid = (ID *)BKE_linestyle_copy(bmain, (FreestyleLineStyle *)id);
  			return true;
 +		case ID_CF:
 +			if (!test) *newid = (ID *)BKE_cachefile_copy(G.main, (CacheFile *)id);
 +			return true;
  	}
  	
  	return false;