[Bf-blender-cvs] [3f9432b] render-layers: From review: use typedef for callbacks

[Dalai Felinto]

Commit: 3f9432b76ac98ae2c86cce1fa3ad043a3d6b0b71
Author: Dalai Felinto
Date:   Fri Dec 16 15:50:08 2016 +0100
Branches: render-layers
https://developer.blender.org/rB3f9432b76ac98ae2c86cce1fa3ad043a3d6b0b71

>From review: use typedef for callbacks

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

M       source/blender/blenkernel/BKE_collection.h
M       source/blender/blenkernel/intern/collection.c

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

diff --git a/source/blender/blenkernel/BKE_collection.h 
b/source/blender/blenkernel/BKE_collection.h
index 846f7f1..0d3f190 100644
--- a/source/blender/blenkernel/BKE_collection.h
+++ b/source/blender/blenkernel/BKE_collection.h
@@ -41,7 +41,9 @@ struct SceneCollection *BKE_collection_master(struct Scene 
*scene);
 void BKE_collection_master_free(struct Scene *scene);
 void BKE_collection_object_add(struct Scene *scene, struct SceneCollection 
*sc, struct Object *object);
 void BKE_collection_object_remove(struct Scene *scene, struct SceneCollection 
*sc, struct Object *object);
-void BKE_scene_objects_callback(struct Scene *scene, void (*callback)(struct 
Object *_ob, void *_data), void *data);
+
+typedef void (*BKE_scene_objects_Cb)(struct Object *ob, void *data);
+void BKE_scene_objects_callback(struct Scene *scene, BKE_scene_objects_Cb 
callback, void *data);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/blenkernel/intern/collection.c 
b/source/blender/blenkernel/intern/collection.c
index 1f19330..4562583 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -220,7 +220,7 @@ static bool object_tag_test(Object *ob)
 /*
  * Recursively calls the callback function for the objects in a SceneCollection
  */
-static void collection_objects_callback(SceneCollection *sc, void 
(*callback)(struct Object *_ob, void *_data), void *data)
+static void collection_objects_callback(SceneCollection *sc, 
BKE_scene_objects_Cb callback, void *data)
 {
        for (LinkData *link= sc->objects.first; link; link = link->next) {
                if (object_tag_test(link->data)) {
@@ -242,7 +242,7 @@ static void collection_objects_callback(SceneCollection 
*sc, void (*callback)(st
  * Recursively calls the callback function for the objects in a Scene
  * The same object
  */
-void BKE_scene_objects_callback(Scene *scene, void (*callback)(struct Object 
*_ob, void *_data), void *data)
+void BKE_scene_objects_callback(Scene *scene, BKE_scene_objects_Cb callback, 
void *data)
 {
        SceneCollection *sc = BKE_collection_master(scene);
        collection_objects_callback(sc, object_tag_clear, NULL);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs