Commit: f49948bf488139214246e782f980ef7f2c7ea6f3 Author: YimingWu Date: Tue Apr 5 22:59:13 2022 +0800 Branches: lineart-object-load https://developer.blender.org/rBf49948bf488139214246e782f980ef7f2c7ea6f3
LineArt: Working fix for new object loading =================================================================== M source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c =================================================================== diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c index e54d12a650a..afcde2c3a7f 100644 --- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c +++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c @@ -2252,6 +2252,12 @@ static void lineart_geometry_object_load_no_bmesh(LineartObjectInfo *ob_info, int allocate_la_e = edge_reduce.feat_edges; + if (!edge_pair_arr) { + edge_pair_alloc_len = 256; + edge_pair_arr = MEM_mallocN(sizeof(EdgeFacePair) * edge_pair_alloc_len, + "lineart edge_pair arr"); + } + /* Check for edge marks that would create feature edges. */ for (int i = 0; i < me->totedge; i++) { MEdge *medge = &me->medge[i]; @@ -2261,7 +2267,7 @@ static void lineart_geometry_object_load_no_bmesh(LineartObjectInfo *ob_info, if (eflag) { int min_edges_to_add = 0; void **eval; - if (!BLI_edgehash_ensure_p(edge_hash, medge->v1, medge->v2, &eval)) { + if (edge_hash == NULL || !BLI_edgehash_ensure_p(edge_hash, medge->v1, medge->v2, &eval)) { int pair_idx = edge_pair_arr_len++; /* Edge has not been added before, create a new pair. */ EdgeFacePair *pair = &edge_pair_arr[pair_idx]; @@ -2271,7 +2277,9 @@ static void lineart_geometry_object_load_no_bmesh(LineartObjectInfo *ob_info, pair->f1 = -1; pair->f2 = -1; pair->eflag = eflag; - *eval = POINTER_FROM_INT(pair_idx); + if (edge_hash) { + *eval = POINTER_FROM_INT(pair_idx); + } min_edges_to_add = 1; if (edge_pair_arr_len == edge_pair_alloc_len) { @@ -2301,7 +2309,9 @@ static void lineart_geometry_object_load_no_bmesh(LineartObjectInfo *ob_info, } } - BLI_edgehash_free(edge_hash, NULL); + if (edge_hash) { + BLI_edgehash_free(edge_hash, NULL); + } la_edge_arr = lineart_mem_acquire_thread(&re_buf->render_data_pool, sizeof(LineartEdge) * allocate_la_e); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs