[Bf-blender-cvs] [30d76f38686] temp-lineart-contained: Cleanup: List argument renaming.
YimingWu
noreply at git.blender.org
Mon May 24 08:38:18 CEST 2021
Commit: 30d76f3868680e3a1a92ef0342e12f57ee1d9d56
Author: YimingWu
Date: Mon May 24 14:38:00 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB30d76f3868680e3a1a92ef0342e12f57ee1d9d56
Cleanup: List argument renaming.
===================================================================
M source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h
M source/blender/gpencil_modifiers/intern/lineart/lineart_util.c
===================================================================
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h b/source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h
index b9f1f4cc26f..c3addd28628 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h
@@ -38,26 +38,28 @@ struct LineartStaticMemPoolNode;
struct LineartEdge;
struct LineartRenderBuffer;
-void *lineart_list_append_pointer_pool(ListBase *h, struct LineartStaticMemPool *smp, void *data);
-void *lineart_list_append_pointer_pool_sized(ListBase *h,
+void *lineart_list_append_pointer_pool(ListBase *list,
+ struct LineartStaticMemPool *smp,
+ void *data);
+void *lineart_list_append_pointer_pool_sized(ListBase *list,
struct LineartStaticMemPool *smp,
void *data,
int size);
-void *lineart_list_append_pointer_pool_thread(ListBase *h,
+void *lineart_list_append_pointer_pool_thread(ListBase *list,
struct LineartStaticMemPool *smp,
void *data);
-void *lineart_list_append_pointer_pool_sized_thread(ListBase *h,
+void *lineart_list_append_pointer_pool_sized_thread(ListBase *list,
LineartStaticMemPool *smp,
void *data,
int size);
-void *list_push_pointer_static(ListBase *h, struct LineartStaticMemPool *smp, void *p);
-void *list_push_pointer_static_sized(ListBase *h,
+void *list_push_pointer_static(ListBase *list, struct LineartStaticMemPool *smp, void *p);
+void *list_push_pointer_static_sized(ListBase *list,
struct LineartStaticMemPool *smp,
void *p,
int size);
-void *lineart_list_pop_pointer_no_free(ListBase *h);
-void lineart_list_remove_pointer_item_no_free(ListBase *h, LinkData *lip);
+void *lineart_list_pop_pointer_no_free(ListBase *list);
+void lineart_list_remove_pointer_item_no_free(ListBase *list, LinkData *lip);
struct LineartStaticMemPoolNode *lineart_mem_new_static_pool(struct LineartStaticMemPool *smp,
size_t size);
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_util.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_util.c
index 6bf651ac1ff..d0d440975a3 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_util.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_util.c
@@ -37,71 +37,73 @@
/* Line art memory and list helper */
-void *lineart_list_append_pointer_pool(ListBase *h, LineartStaticMemPool *smp, void *data)
+void *lineart_list_append_pointer_pool(ListBase *list, LineartStaticMemPool *smp, void *data)
{
LinkData *lip;
- if (h == NULL) {
+ if (list == NULL) {
return 0;
}
lip = lineart_mem_acquire(smp, sizeof(LinkData));
lip->data = data;
- BLI_addtail(h, lip);
+ BLI_addtail(list, lip);
return lip;
}
-void *lineart_list_append_pointer_pool_sized(ListBase *h,
+void *lineart_list_append_pointer_pool_sized(ListBase *list,
LineartStaticMemPool *smp,
void *data,
int size)
{
LinkData *lip;
- if (h == NULL) {
+ if (list == NULL) {
return 0;
}
lip = lineart_mem_acquire(smp, size);
lip->data = data;
- BLI_addtail(h, lip);
+ BLI_addtail(list, lip);
return lip;
}
-void *lineart_list_append_pointer_pool_thread(ListBase *h, LineartStaticMemPool *smp, void *data)
+void *lineart_list_append_pointer_pool_thread(ListBase *list,
+ LineartStaticMemPool *smp,
+ void *data)
{
LinkData *lip;
- if (h == NULL) {
+ if (list == NULL) {
return 0;
}
lip = lineart_mem_acquire_thread(smp, sizeof(LinkData));
lip->data = data;
- BLI_addtail(h, lip);
+ BLI_addtail(list, lip);
return lip;
}
-void *lineart_list_append_pointer_pool_sized_thread(ListBase *h,
+void *lineart_list_append_pointer_pool_sized_thread(ListBase *list,
LineartStaticMemPool *smp,
void *data,
int size)
{
LinkData *lip;
- if (h == NULL) {
+ if (list == NULL) {
return 0;
}
lip = lineart_mem_acquire_thread(smp, size);
lip->data = data;
- BLI_addtail(h, lip);
+ BLI_addtail(list, lip);
return lip;
}
-void *lineart_list_pop_pointer_no_free(ListBase *h)
+void *lineart_list_pop_pointer_no_free(ListBase *list)
{
LinkData *lip;
void *rev = 0;
- if (h == NULL) {
+ if (list == NULL) {
return 0;
}
- lip = BLI_pophead(h);
+ lip = BLI_pophead(list);
rev = lip ? lip->data : 0;
return rev;
}
-void lineart_list_remove_pointer_item_no_free(ListBase *h, LinkData *lip)
+void lineart_list_remove_pointer_item_no_free(ListBase *list, LinkData *lip)
{
- BLI_remlink(h, (void *)lip);
+ BLI_remlink(list, (void *)lip);
}
LineartStaticMemPoolNode *lineart_mem_new_static_pool(LineartStaticMemPool *smp, size_t size)
More information about the Bf-blender-cvs
mailing list