diff options
| author | Jorge Bernal <jbernalmartinez@gmail.com> | 2015-01-29 08:03:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-29 08:43:20 +0300 |
| commit | 072d80a9de3adef632b8637649b169c4a895c1b9 (patch) | |
| tree | f3b82fe2120242a5ce636e0fa298bb058649e960 /source/blender/makesrna/intern/rna_actuator.c | |
| parent | 65574b0b030fd1a893520fe967e580ed00308cb5 (diff) | |
Fix T42858: Non uniform gamelogic names on copy
Use generic function for consistent behavior
D949 by @lordloki
Diffstat (limited to 'source/blender/makesrna/intern/rna_actuator.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_actuator.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c index 9c7d66d00c7..691a7432275 100644 --- a/source/blender/makesrna/intern/rna_actuator.c +++ b/source/blender/makesrna/intern/rna_actuator.c @@ -120,14 +120,10 @@ static StructRNA *rna_Actuator_refine(struct PointerRNA *ptr) static void rna_Actuator_name_set(PointerRNA *ptr, const char *value) { - bActuator *act = (bActuator *)ptr->data; - + Object *ob = ptr->id.data; + bActuator *act = ptr->data; BLI_strncpy_utf8(act->name, value, sizeof(act->name)); - - if (ptr->id.data) { - Object *ob = (Object *)ptr->id.data; - BLI_uniquename(&ob->actuators, act, DATA_("Actuator"), '.', offsetof(bActuator, name), sizeof(act->name)); - } + BLI_uniquename(&ob->actuators, act, DATA_("Actuator"), '.', offsetof(bActuator, name), sizeof(act->name)); } static void rna_Actuator_type_set(struct PointerRNA *ptr, int value) |