diff options
| author | Peter Kim <pk15950@gmail.com> | 2022-06-17 11:27:30 +0300 |
|---|---|---|
| committer | Peter Kim <pk15950@gmail.com> | 2022-06-17 11:27:30 +0300 |
| commit | a39532670f6b668da7be5810fb1f844b82feeba3 (patch) | |
| tree | 4d6a40f6c362ca1d9b7c7031527e6e54a62589e6 /source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h | |
| parent | 7948150ca3683dc326c37609ded322d54b832d0d (diff) | |
| parent | 10981bc8c092dda48ed5228cc19108513035abf0 (diff) | |
Merge branch 'master' into xr-dev
Diffstat (limited to 'source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h')
| -rw-r--r-- | source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h b/source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h index 2114ca1dc91..5e24061bd78 100644 --- a/source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h +++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h @@ -18,7 +18,7 @@ #include <string.h> struct LineartEdge; -struct LineartRenderBuffer; +struct LineartData; struct LineartStaticMemPool; struct LineartStaticMemPoolNode; @@ -49,7 +49,6 @@ void *lineart_mem_acquire(struct LineartStaticMemPool *smp, size_t size); void *lineart_mem_acquire_thread(struct LineartStaticMemPool *smp, size_t size); void lineart_mem_destroy(struct LineartStaticMemPool *smp); -void lineart_prepend_edge_direct(void **list_head, void *node); void lineart_prepend_pool(LinkNode **first, struct LineartStaticMemPool *smp, void *link); void lineart_matrix_ortho_44d(double (*mProjection)[4], @@ -62,14 +61,14 @@ void lineart_matrix_ortho_44d(double (*mProjection)[4], void lineart_matrix_perspective_44d( double (*mProjection)[4], double fFov_rad, double fAspect, double zMin, double zMax); -int lineart_count_intersection_segment_count(struct LineartRenderBuffer *rb); +int lineart_count_intersection_segment_count(struct LineartData *ld); -void lineart_count_and_print_render_buffer_memory(struct LineartRenderBuffer *rb); +void lineart_count_and_print_render_buffer_memory(struct LineartData *ld); #define LRT_ITER_ALL_LINES_BEGIN \ LineartEdge *e; \ - for (int i = 0; i < rb->pending_edges.next; i++) { \ - e = rb->pending_edges.array[i]; + for (int i = 0; i < ld->pending_edges.next; i++) { \ + e = ld->pending_edges.array[i]; #define LRT_ITER_ALL_LINES_NEXT ; /* Doesn't do anything now with new array setup. */ |