diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-02-13 11:44:13 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-02-13 11:46:51 +0300 |
commit | 67fa545ed06ef9a5afd1da2591fa8cc60ed808fb (patch) | |
tree | 3e8f14aa123276eef48194d7ffa25467b15195f1 /source/blender/blenkernel | |
parent | 270bbc89ec2b311ea6d2467304606116fcc38ed1 (diff) |
Make modifier_unique_name return whether modifier was renamed or not
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_modifier.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 5 |
2 files changed, 4 insertions, 3 deletions
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) |