diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-02-11 16:42:36 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-02-11 16:42:36 +0300 |
commit | 18ac37a39b7d74e0fb76cf2b1a09c470c32a68bf (patch) | |
tree | ac9a043bce6284dbbb3062ca7e78b116519d3c0c /source/blender/editors/mesh | |
parent | dabf96f732d1ce5f44f53230317ff0d0b8a380df (diff) | |
parent | 196dfc01a3e99c3bef0e44acf599bca50ae0300e (diff) |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r-- | source/blender/editors/mesh/editmesh_undo.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/source/blender/editors/mesh/editmesh_undo.c b/source/blender/editors/mesh/editmesh_undo.c index d7f7cfa2888..dd51d63961c 100644 --- a/source/blender/editors/mesh/editmesh_undo.c +++ b/source/blender/editors/mesh/editmesh_undo.c @@ -153,6 +153,23 @@ static void um_arraystore_cd_compact(struct CustomData *cdata, for (int layer_start = 0, layer_end; layer_start < cdata->totlayer; layer_start = layer_end) { const CustomDataType type = cdata->layers[layer_start].type; + /* Perform a full copy on dynamic layers. + * + * Unfortunately we can't compare dynamic layer types as they contain allocated pointers, + * which burns CPU cycles looking for duplicate data that doesn't exist. + * The array data isn't comparable once copied from the mesh, + * this bottlenecks on high poly meshes, see T84114. + * + * Notes: + * + * - Ideally the data would be expanded into a format that could be de-duplicated effectively, + * this would require a flat representation of each dynamic custom-data layer. + * + * - The data in the layer could be kept as-is to save on the extra copy, + * it would complicate logic in this function. + */ + const bool layer_type_is_dynamic = CustomData_layertype_is_dynamic(type); + layer_end = layer_start + 1; while ((layer_end < cdata->totlayer) && (type == cdata->layers[layer_end].type)) { layer_end++; @@ -209,6 +226,11 @@ static void um_arraystore_cd_compact(struct CustomData *cdata, i < bcd_reference_current->states_len) ? bcd_reference_current->states[i] : NULL; + /* See comment on `layer_type_is_dynamic` above. */ + if (layer_type_is_dynamic) { + state_reference = NULL; + } + bcd->states[i] = BLI_array_store_state_add( bs, layer->data, (size_t)data_len * stride, state_reference); } |