From 1203bd58beffbfd517818521750cdc3f1d273cd2 Mon Sep 17 00:00:00 2001
From: Martijn Versteegh <Baardaap>
Date: Tue, 7 Jun 2022 14:51:52 +0200
Subject: [PATCH] Fix: Make renaming attributes check uniqueness on all domains

This function only checked for uniqueness in the current domain,
while attribute names should be unique among all domains within
a geometry.

Differential Revision: https://developer.blender.org/D15144
---
 source/blender/blenkernel/intern/attribute.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/blender/blenkernel/intern/attribute.cc b/source/blender/blenkernel/intern/attribute.cc
index fedcfc5c721..4dd25ba1292 100644
--- a/source/blender/blenkernel/intern/attribute.cc
+++ b/source/blender/blenkernel/intern/attribute.cc
@@ -138,8 +138,10 @@ bool BKE_id_attribute_rename(ID *id,
     return false;
   }
 
-  BLI_strncpy_utf8(layer->name, new_name, sizeof(layer->name));
-  CustomData_set_layer_unique_name(customdata, layer - customdata->layers);
+  char result_name[MAX_CUSTOMDATA_LAYER_NAME];
+  BKE_id_attribute_calc_unique_name(id, new_name, result_name);
+  BLI_strncpy_utf8(layer->name, result_name, sizeof(layer->name));
+
   return true;
 }