From eabb4f16ce67763e4bc17c4ffe68e9f63cbfede8 Mon Sep 17 00:00:00 2001 From: Falk David Date: Fri, 16 Feb 2024 15:26:23 +0100 Subject: [PATCH] Revert "Fix: GPv3: Move dvert copy out of parallel for" This reverts commit 31b8323b93891d5021425c45f3add1d7bb8fba23. Allocating memory in parallel is fine as long as each threads only writes to the memory it allocates, which is the case here. --- .../blenkernel/intern/grease_pencil_convert_legacy.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc b/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc index 2170ea5ab62..8220396c796 100644 --- a/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc +++ b/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc @@ -206,6 +206,9 @@ void legacy_gpencil_frame_to_grease_pencil_drawing(const bGPDframe &gpf, dst_rotations[point_i] = pt.uv_rot; dst_vertex_colors[point_i] = ColorGeometry4f(pt.vert_color); dst_selection[point_i] = (pt.flag & GP_SPOINT_SELECT) != 0; + if (use_dverts && gps->dvert) { + copy_dvert(gps->dvert[point_i], dst_dverts[point_i]); + } } }); @@ -218,12 +221,6 @@ void legacy_gpencil_frame_to_grease_pencil_drawing(const bGPDframe &gpf, dst_deltatimes[point_i] = pt.time - pt_prev.time; } }); - - if (use_dverts && gps->dvert) { - for (const int point_i : src_points.index_range()) { - copy_dvert(gps->dvert[point_i], dst_dverts[point_i]); - } - } } delta_times.finish();