[Bf-blender-cvs] [ebd7269] alembic: Set the 'from' pointer in Key directly in the init method, so it works with NULL pointers too.

Lukas Tönne noreply at git.blender.org
Tue May 19 15:42:48 CEST 2015


Commit: ebd7269a99c78af474fd3a3f8d5087353a4ca4ba
Author: Lukas Tönne
Date:   Tue May 19 15:42:11 2015 +0200
Branches: alembic
https://developer.blender.org/rBebd7269a99c78af474fd3a3f8d5087353a4ca4ba

Set the 'from' pointer in Key directly in the init method, so it works
with NULL pointers too.

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

M	source/blender/blenkernel/intern/key.c

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

diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index 0d9f088..d7308e3 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -142,7 +142,7 @@ Key *BKE_key_add_ex(ID *from, int fromtype, int fromindex)    /* common function
 	key = BKE_libblock_alloc(G.main, ID_KE, "Key");
 	
 	key->type = KEY_NORMAL;
-	BKE_key_set_from_id(key, from);
+	key->from = from;
 	key->fromtype = fromtype;
 	key->fromindex = fromindex;




More information about the Bf-blender-cvs mailing list