[Bf-blender-cvs] [0f143627d2c] blender2.8: Collection: __FUNCTION__ > __func__

Dalai Felinto noreply at git.blender.org
Mon Apr 24 18:15:45 CEST 2017


Commit: 0f143627d2c80e905383bd45f6725644c483fbb3
Author: Dalai Felinto
Date:   Mon Apr 24 18:15:37 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB0f143627d2c80e905383bd45f6725644c483fbb3

Collection: __FUNCTION__ > __func__

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

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

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

diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 9739bbad09b..992c5d706a6 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -511,7 +511,7 @@ static void scene_collections_array(Scene *scene, SceneCollection ***collections
 void BKE_scene_collections_iterator_begin(Iterator *iter, void *data_in)
 {
 	Scene *scene = data_in;
-	SceneCollectionsIteratorData *data = MEM_callocN(sizeof(SceneCollectionsIteratorData), __FUNCTION__);
+	SceneCollectionsIteratorData *data = MEM_callocN(sizeof(SceneCollectionsIteratorData), __func__);
 
 	data->scene = scene;
 	iter->data = data;
@@ -561,7 +561,7 @@ typedef struct SceneObjectsIteratorData {
 void BKE_scene_objects_iterator_begin(Iterator *iter, void *data_in)
 {
 	Scene *scene = data_in;
-	SceneObjectsIteratorData *data = MEM_callocN(sizeof(SceneObjectsIteratorData), __FUNCTION__);
+	SceneObjectsIteratorData *data = MEM_callocN(sizeof(SceneObjectsIteratorData), __func__);
 	iter->data = data;
 
 	/* lookup list ot make sure each object is object called once */




More information about the Bf-blender-cvs mailing list