[Bf-blender-cvs] [30099d8] soc-2014-shapekey: Merge remote-tracking branch 'origin' into soc

Grigory Revzin noreply at git.blender.org
Sat Aug 2 04:12:23 CEST 2014


Commit: 30099d85442716ce9ad0967cd24d86c7a7acfe07
Author: Grigory Revzin
Date:   Sat Aug 2 06:11:51 2014 +0400
Branches: soc-2014-shapekey
https://developer.blender.org/rB30099d85442716ce9ad0967cd24d86c7a7acfe07

Merge remote-tracking branch 'origin' into soc

Conflicts:
	source/blender/blenloader/intern/versioning_270.c

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



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

diff --cc source/blender/blenkernel/intern/key.c
index e5bba52,2dc615c..bb2cecb
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@@ -247,9 -194,8 +247,9 @@@ Key *BKE_key_copy_nolib(Key *key
  	kbn = keyn->block.first;
  	while (kbn) {
  		
--		if (kbn->data) kbn->data = MEM_dupallocN(kbn->data);
++		if (kb->data) kbn->data = MEM_dupallocN(kb->data);
  		if (kb == key->refkey) keyn->refkey = kbn;
 +		if (kb == key->scratch.origin) keyn->scratch.origin = kbn;
  		
  		kbn = kbn->next;
  		kb = kb->next;
diff --cc source/blender/blenloader/intern/versioning_270.c
index 64e73a9,dde16c8..12603ba
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -42,7 -42,7 +42,8 @@@
  #include "DNA_mesh_types.h"
  #include "DNA_modifier_types.h"
  #include "DNA_linestyle_types.h"
 +#include "DNA_key_types.h"
+ #include "DNA_actuator_types.h"
  
  #include "DNA_genfile.h"




More information about the Bf-blender-cvs mailing list