diff options
Diffstat (limited to 'source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c')
-rw-r--r-- | source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c index e9cb8453f43..52f7d3652a7 100644 --- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c +++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c @@ -134,8 +134,8 @@ static LineartLineSegment *lineart_give_segment(LineartRenderBuffer *rb) BLI_spin_unlock(&rb->lock_cuts); /* Otherwise allocate some new memory. */ - return (LineartLineSegment *)lineart_mem_aquire_thread(&rb->render_data_pool, - sizeof(LineartLineSegment)); + return (LineartLineSegment *)lineart_mem_acquire_thread(&rb->render_data_pool, + sizeof(LineartLineSegment)); } /** @@ -631,8 +631,8 @@ static LineartElementLinkNode *lineart_memory_get_triangle_space(LineartRenderBu /* We don't need to allocate a whole bunch of triangles because the amount of clipped triangles * are relatively small. */ - LineartTriangle *render_triangles = lineart_mem_aquire(&rb->render_data_pool, - 64 * rb->triangle_size); + LineartTriangle *render_triangles = lineart_mem_acquire(&rb->render_data_pool, + 64 * rb->triangle_size); reln = lineart_list_append_pointer_pool_sized(&rb->triangle_buffer_pointers, &rb->render_data_pool, @@ -648,8 +648,8 @@ static LineartElementLinkNode *lineart_memory_get_vert_space(LineartRenderBuffer { LineartElementLinkNode *reln; - LineartVert *render_vertices = lineart_mem_aquire(&rb->render_data_pool, - sizeof(LineartVert) * 64); + LineartVert *render_vertices = lineart_mem_acquire(&rb->render_data_pool, + sizeof(LineartVert) * 64); reln = lineart_list_append_pointer_pool_sized(&rb->vertex_buffer_pointers, &rb->render_data_pool, @@ -665,7 +665,7 @@ static LineartElementLinkNode *lineart_memory_get_edge_space(LineartRenderBuffer { LineartElementLinkNode *reln; - LineartEdge *render_edges = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartEdge) * 64); + LineartEdge *render_edges = lineart_mem_acquire(&rb->render_data_pool, sizeof(LineartEdge) * 64); reln = lineart_list_append_pointer_pool_sized(&rb->line_buffer_pointers, &rb->render_data_pool, @@ -755,7 +755,7 @@ static void lineart_triangle_cull_single(LineartRenderBuffer *rb, e = new_e; \ e->v1_obindex = v1_obi; \ e->v2_obindex = v2_obi; \ - rls = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartLineSegment)); \ + rls = lineart_mem_acquire(&rb->render_data_pool, sizeof(LineartLineSegment)); \ BLI_addtail(&e->segments, rls); #define SELECT_RL(e_num, v1_link, v2_link, newrt) \ @@ -1576,8 +1576,8 @@ static void lineart_geometry_object_load(Depsgraph *dg, /* Only allocate memory for verts and tris as we don't know how many lines we will generate * yet. */ - orv = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartVert) * bm->totvert); - ort = lineart_mem_aquire(&rb->render_data_pool, bm->totface * rb->triangle_size); + orv = lineart_mem_acquire(&rb->render_data_pool, sizeof(LineartVert) * bm->totvert); + ort = lineart_mem_acquire(&rb->render_data_pool, bm->totface * rb->triangle_size); orig_ob = ob->id.orig_id ? (Object *)ob->id.orig_id : ob; @@ -1675,7 +1675,7 @@ static void lineart_geometry_object_load(Depsgraph *dg, e->head.hflag = eflag; } - o_la_e = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartEdge) * allocate_la_e); + o_la_e = lineart_mem_acquire(&rb->render_data_pool, sizeof(LineartEdge) * allocate_la_e); reln = lineart_list_append_pointer_pool_sized( &rb->line_buffer_pointers, &rb->render_data_pool, o_la_e, sizeof(LineartElementLinkNode)); reln->element_count = allocate_la_e; @@ -1707,8 +1707,8 @@ static void lineart_geometry_object_load(Depsgraph *dg, la_e->flags = e->head.hflag; la_e->object_ref = orig_ob; - LineartLineSegment *rls = lineart_mem_aquire(&rb->render_data_pool, - sizeof(LineartLineSegment)); + LineartLineSegment *rls = lineart_mem_acquire(&rb->render_data_pool, + sizeof(LineartLineSegment)); BLI_addtail(&la_e->segments, rls); if (ELEM(usage, OBJECT_LRT_INHERIT, OBJECT_LRT_INCLUDE, OBJECT_LRT_NO_INTERSECTION)) { lineart_add_edge_to_list(rb, la_e); @@ -2344,7 +2344,7 @@ static LineartVert *lineart_triangle_2v_intersection_test(LineartRenderBuffer *r /* This is an intersection vert, the size is bigger than LineartVert, * allocated separately. */ - result = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartVertIntersection)); + result = lineart_mem_acquire(&rb->render_data_pool, sizeof(LineartVertIntersection)); /* Indicate the data structure difference. */ result->flag = LRT_VERT_HAS_INTERSECTION_DATA; @@ -2388,7 +2388,7 @@ static LineartEdge *lineart_triangle_intersect(LineartRenderBuffer *rb, LineartVert *new_share; lineart_triangle_get_other_verts(rt, share, &sv1, &sv2); - v1 = new_share = lineart_mem_aquire(&rb->render_data_pool, (sizeof(LineartVertIntersection))); + v1 = new_share = lineart_mem_acquire(&rb->render_data_pool, (sizeof(LineartVertIntersection))); new_share->flag = LRT_VERT_HAS_INTERSECTION_DATA; @@ -2487,13 +2487,13 @@ static LineartEdge *lineart_triangle_intersect(LineartRenderBuffer *rb, ((LineartVertIntersection *)v1)->intersecting_with = rt; ((LineartVertIntersection *)v2)->intersecting_with = testing; - result = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartEdge)); + result = lineart_mem_acquire(&rb->render_data_pool, sizeof(LineartEdge)); result->v1 = v1; result->v2 = v2; result->t1 = rt; result->t2 = testing; - LineartLineSegment *rls = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartLineSegment)); + LineartLineSegment *rls = lineart_mem_acquire(&rb->render_data_pool, sizeof(LineartLineSegment)); BLI_addtail(&result->segments, rls); /* Don't need to OR flags right now, just a type mark. */ result->flags = LRT_EDGE_FLAG_INTERSECTION; @@ -2729,7 +2729,7 @@ static void lineart_main_bounding_area_make_initial(LineartRenderBuffer *rb) rb->height_per_tile = span_h; rb->bounding_area_count = sp_w * sp_h; - rb->initial_bounding_areas = lineart_mem_aquire( + rb->initial_bounding_areas = lineart_mem_acquire( &rb->render_data_pool, sizeof(LineartBoundingArea) * rb->bounding_area_count); /* Initialize tiles. */ @@ -2923,8 +2923,8 @@ static void lineart_bounding_area_split(LineartRenderBuffer *rb, LineartBoundingArea *root, int recursive_level) { - LineartBoundingArea *ba = lineart_mem_aquire(&rb->render_data_pool, - sizeof(LineartBoundingArea) * 4); + LineartBoundingArea *ba = lineart_mem_acquire(&rb->render_data_pool, + sizeof(LineartBoundingArea) * 4); LineartTriangle *rt; LineartEdge *e; |