[Bf-blender-cvs] [99c5bd0cd9e] blender2.8: Merge branch 'master' into blender2.8

Sergey Sharybin noreply at git.blender.org
Wed Apr 25 17:00:27 CEST 2018


Commit: 99c5bd0cd9e407940817ece6a4155788e392f795
Author: Sergey Sharybin
Date:   Wed Apr 25 17:00:19 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB99c5bd0cd9e407940817ece6a4155788e392f795

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/intern/library.c
index c0eb9e77087,292f37b5ce9..c08a8c4aa4c
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@@ -1419,16 -1325,8 +1419,17 @@@ void BKE_libblock_copy_ex(Main *bmain, 
  		new_id->properties = IDP_CopyProperty_ex(id->properties, flag);
  	}
  
 +	/* XXX Again... We need a way to control what we copy in a much more refined way.
 +	 * We cannot always copy this, some internal copying will die on it! */
 +	/* For now, upper level code will have to do that itself when required. */
 +#if 0
 +	if (id->override != NULL) {
 +		BKE_override_copy(new_id, id);
 +	}
 +#endif
 +
  	/* the duplicate should get a copy of the animdata */
+ 	BLI_assert((flag & LIB_ID_COPY_ACTIONS) == 0 || (flag & LIB_ID_CREATE_NO_MAIN) == 0);
  	id_copy_animdata(bmain, new_id, (flag & LIB_ID_COPY_ACTIONS) != 0 && (flag & LIB_ID_CREATE_NO_MAIN) == 0);
  
  	if ((flag & LIB_ID_CREATE_NO_DEG_TAG) == 0 && (flag & LIB_ID_CREATE_NO_MAIN) == 0) {



More information about the Bf-blender-cvs mailing list