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_controller.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_controller.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_controller.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source/blender/makesrna/intern/rna_controller.c b/source/blender/makesrna/intern/rna_controller.c index 8b5074eaf0d..ba0214d36ec 100644 --- a/source/blender/makesrna/intern/rna_controller.c +++ b/source/blender/makesrna/intern/rna_controller.c @@ -85,15 +85,10 @@ static StructRNA *rna_Controller_refine(struct PointerRNA *ptr) static void rna_Constroller_name_set(PointerRNA *ptr, const char *value) { - bController *cont = (bController *)ptr->data; - + Object *ob = ptr->id.data; + bController *cont = ptr->data; BLI_strncpy_utf8(cont->name, value, sizeof(cont->name)); - - if (ptr->id.data) { - Object *ob = (Object *)ptr->id.data; - BLI_uniquename(&ob->controllers, cont, DATA_("Controller"), '.', offsetof(bController, name), - sizeof(cont->name)); - } + BLI_uniquename(&ob->controllers, cont, DATA_("Controller"), '.', offsetof(bController, name), sizeof(cont->name)); } static void rna_Controller_type_set(struct PointerRNA *ptr, int value) |