[Bf-blender-cvs] [5146034aa9b] master: Blenloader: simplify list reading api

[Jacques Lucke]

Commit: 5146034aa9b9b39f855232a352e4baedfb28c84b
Author: Jacques Lucke
Date:   Sat Jun 6 12:53:36 2020 +0200
Branches: master
https://developer.blender.org/rB5146034aa9b9b39f855232a352e4baedfb28c84b

Blenloader: simplify list reading api

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

M	source/blender/blenloader/BLO_read_write.h
M	source/blender/blenloader/intern/readfile.c

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

diff --git a/source/blender/blenloader/BLO_read_write.h b/source/blender/blenloader/BLO_read_write.h
index 3d3855d1d16..59116b4eefc 100644
--- a/source/blender/blenloader/BLO_read_write.h
+++ b/source/blender/blenloader/BLO_read_write.h
@@ -171,7 +171,7 @@ bool BLO_write_is_undo(BlendWriter *writer);
  *   BLO_read_data_address(reader, &clmd->sim_parms);
  *
  *   BLO_write_struct_list(writer, TimeMarker, &action->markers);
- *   BLO_read_list(reader, &action->markers, NULL);
+ *   BLO_read_list(reader, &action->markers);
  *
  *   BLO_write_int32_array(writer, hmd->totindex, hmd->indexar);
  *   BLO_read_int32_array(reader, hmd->totindex, &hmd->indexar);
@@ -183,7 +183,8 @@ void *BLO_read_get_new_data_address(BlendDataReader *reader, const void *old_add
   *(ptr_p) = BLO_read_get_new_data_address((reader), *(ptr_p))
 
 typedef void (*BlendReadListFn)(BlendDataReader *reader, void *data);
-void BLO_read_list(BlendDataReader *reader, struct ListBase *list, BlendReadListFn callback);
+void BLO_read_list_cb(BlendDataReader *reader, struct ListBase *list, BlendReadListFn callback);
+void BLO_read_list(BlendDataReader *reader, struct ListBase *list);
 
 /* Update data pointers and correct byte-order if necessary. */
 void BLO_read_int32_array(BlendDataReader *reader, int array_size, int32_t **ptr_p);
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 53502a8138a..52e30acf89b 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -12724,6 +12724,11 @@ void BLO_read_list(BlendDataReader *reader, ListBase *list, BlendReadListFn call
   list->last = prev;
 }
 
+void BLO_read_list(BlendDataReader *reader, struct ListBase *list)
+{
+  BLO_read_list_cb(reader, list, NULL);
+}
+
 void BLO_read_int32_array(BlendDataReader *reader, int array_size, int32_t **ptr_p)
 {
   BLO_read_data_address(reader, ptr_p);