Commit: 016e452b5f954ff1cfef78ddcdc82c56d82f8495 Author: YimingWu Date: Sun May 15 22:16:54 2022 +0800 Branches: temp-lineart-contained https://developer.blender.org/rB016e452b5f954ff1cfef78ddcdc82c56d82f8495
Merge remote-tracking branch 'origin/master' into temp-lineart-contained =================================================================== =================================================================== diff --cc source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c index bddb6b23b85,11d368b819c..dfd98e64511 --- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c +++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c @@@ -2435,17 -2505,9 +2494,9 @@@ static void lineart_main_load_geometrie BLI_listbase_clear(&rb->triangle_buffer_pointers); BLI_listbase_clear(&rb->vertex_buffer_pointers); - int flags = DEG_ITER_OBJECT_FLAG_LINKED_DIRECTLY | DEG_ITER_OBJECT_FLAG_LINKED_VIA_SET | - DEG_ITER_OBJECT_FLAG_VISIBLE; - - /* Instance duplicated & particles. */ - if (allow_duplicates) { - flags |= DEG_ITER_OBJECT_FLAG_DUPLI; - } - int thread_count = rb->thread_count; - /* This memory is in render buffer memory pool. so we don't need to free those after loading. + /* This memory is in render buffer memory pool. So we don't need to free those after loading. */ LineartObjectLoadTaskInfo *olti = lineart_mem_acquire( &rb->render_data_pool, sizeof(LineartObjectLoadTaskInfo) * thread_count); _______________________________________________ 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