[Bf-blender-cvs] [dbab52e4c0d] master: Cleanup: Set BKE_key_from_object/_p to take const Object *

Dalai Felinto noreply at git.blender.org
Fri Mar 1 15:45:31 CET 2019


Commit: dbab52e4c0d8e96db562afbab99b9fb6b46364e7
Author: Dalai Felinto
Date:   Tue Feb 26 18:14:09 2019 -0300
Branches: master
https://developer.blender.org/rBdbab52e4c0d8e96db562afbab99b9fb6b46364e7

Cleanup: Set BKE_key_from_object/_p to take const Object *

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

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

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

diff --git a/source/blender/blenkernel/BKE_key.h b/source/blender/blenkernel/BKE_key.h
index 9f2ed073fa1..d0d558cb829 100644
--- a/source/blender/blenkernel/BKE_key.h
+++ b/source/blender/blenkernel/BKE_key.h
@@ -60,8 +60,8 @@ bool BKE_key_idtype_support(const short id_type);
 
 struct Key     **BKE_key_from_id_p(struct ID *id);
 struct Key      *BKE_key_from_id(struct ID *id);
-struct Key     **BKE_key_from_object_p(struct Object *ob);
-struct Key      *BKE_key_from_object(struct Object *ob);
+struct Key     **BKE_key_from_object_p(const struct Object *ob);
+struct Key      *BKE_key_from_object(const struct Object *ob);
 struct KeyBlock *BKE_keyblock_from_object(struct Object *ob);
 struct KeyBlock *BKE_keyblock_from_object_reference(struct Object *ob);
 
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index 2e24897b1f3..f85f0052c61 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -1415,7 +1415,7 @@ Key *BKE_key_from_id(ID *id)
 	return NULL;
 }
 
-Key **BKE_key_from_object_p(Object *ob)
+Key **BKE_key_from_object_p(const Object *ob)
 {
 	if (ob == NULL || ob->data == NULL)
 		return NULL;
@@ -1423,7 +1423,7 @@ Key **BKE_key_from_object_p(Object *ob)
 	return BKE_key_from_id_p(ob->data);
 }
 
-Key *BKE_key_from_object(Object *ob)
+Key *BKE_key_from_object(const Object *ob)
 {
 	Key **key_p;
 	key_p = BKE_key_from_object_p(ob);



More information about the Bf-blender-cvs mailing list