From 67fa545ed06ef9a5afd1da2591fa8cc60ed808fb Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 13 Feb 2015 13:44:13 +0500 Subject: Make modifier_unique_name return whether modifier was renamed or not --- source/blender/blenkernel/BKE_modifier.h | 2 +- source/blender/blenkernel/intern/modifier.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index 75616b9df78..12eb78e422b 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -319,7 +319,7 @@ ModifierTypeInfo *modifierType_getInfo(ModifierType type); struct ModifierData *modifier_new(int type); void modifier_free(struct ModifierData *md); -void modifier_unique_name(struct ListBase *modifiers, struct ModifierData *md); +bool modifier_unique_name(struct ListBase *modifiers, struct ModifierData *md); void modifier_copyData_generic(const struct ModifierData *md, struct ModifierData *target); void modifier_copyData(struct ModifierData *md, struct ModifierData *target); diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 021e564ef95..42247d866e4 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -143,13 +143,14 @@ void modifier_free(ModifierData *md) MEM_freeN(md); } -void modifier_unique_name(ListBase *modifiers, ModifierData *md) +bool modifier_unique_name(ListBase *modifiers, ModifierData *md) { if (modifiers && md) { ModifierTypeInfo *mti = modifierType_getInfo(md->type); - BLI_uniquename(modifiers, md, DATA_(mti->name), '.', offsetof(ModifierData, name), sizeof(md->name)); + return BLI_uniquename(modifiers, md, DATA_(mti->name), '.', offsetof(ModifierData, name), sizeof(md->name)); } + return false; } bool modifier_dependsOnTime(ModifierData *md) -- cgit v1.2.3